Added more CR comments