More CR comments added