Addressing CR comments again;