new template and edits