wip clean up type three transformation