TnT_v2 - partially working - fixed indentation