Port to new flight version