some changes in template