changes done acc. to CR comments