more TST changes