Got rid of MakeTvar() functions