wip/nemo/patches
