Added general self-consistency to TMT