updated to new template