some comments changed