changes on the templates