CC - Templates update pt 1 of 2