Moved measurements to the courier.