Added some CR comments