Initial TS3 changes