First round of template changes.