wip/SOPE/patches
