flight updates
merge pull