Restructure measurement.