wip/ejourn/patches
