removed redundant DEF_MEASUREMENT_WAIT