Changes to the templates