More changes to template