Update to TnT_v2