wip/tde/patches
