Large update to template