Slight adjustment to template