wip/e16/patches
