modify Motion and Odometer for new mechanism