wip/amaya/patches
