updated with new template