wip/sxid/patches
