Updates to templates to fields I missed - 30 mins