wip/eic/patches
