Added some more CR comments