some changes to template