Slight changes to Template