t2s is back
fix merge part 2