wip/pxz/patches
