Slight changes to template