updated handling of TR