Addressing CR feedback
Accepting new baselines