some changes made to the templates