CLSN-982 code review till 20th july