adressing CR comments