made some changes to template