wip/mppdec/patches
