wip/sxiv/patches
