CLSN-984 code review till 20th july