new changes for template