Some CR comments added