-Update the template as per Eric's suggestions