Added CR comments, More to come