ThrustOff refactored