wip/freedup/patches
