changed to new template format