Addressing CR comments