some comments added and deleted