WIP: update t1, t2, tcd to use same strut as in V2