TT macros updated