Updates to templates,