changes done as per sanket feedback

EOD 30 July