Worked on templates