Altered Airline implementation a bit.