some changes in templates