Addressing more feedback from eng.