Moved calibrator to prevent collisions