wip/e3/patches
