some changes made in comments