Changes necessary for template