Changed the temaplates