more of tcontent refactors