wip/xspd/patches
