wip/mathopd/patches
