Replaced old templates with the new