wip/hpoj/patches
