Some changes to template.