Changed the way the templates are being called.