updates and new template