This was more changes to template files