TOS/TDR update

Back on the pain train. But maybe not for too long. I hope.