Incorporated CR comments

Incorporated CR comments