update to new template system