wip/wise2/patches
