Worked on more templates