Update to TnT_v2 - not yet working