wip/eor/patches
