Updated to latest TC and TT