Measurement Check Improvement

Measurement Check Improvement