Further adjustments to the Template