wip/freedup16/patches
