Changed some of the templates