updated to template