added measurement, changed measurement order