Revise TOS handling.