wip/xoo/patches
