wip/opd/patches
