wip/fontaine/patches
