Updated functions for Flight.