Remaking ToS