New changes for template