Modified Odometer() and run()