CR comments addressed