updated with template.html