Changed flight check to actual state rather than what was saved
Updated with new Cordstone