wip/lissac/patches
