Incorporated CR comments