Changes to template