Shoudnt be in template change
re-added proper tos
Updated for BWC