wip/vpr/patches
