change TOS
Merge branch 'master' into puma
Change TOS to actual