wip/xbase/patches
