Minor alterations to template