Updated for flight 21