Slight Changes to Template