changes for templates