Now works for all flights