wip/trinity/patches
