wip/slune/patches
