wip/ppp/patches
