refactoring partial to measurement, now is only one