wip/xplore/patches
