Massive update to the TS1 system