t2 and tst7 - upgrades