New changes to the template