Worked on templating