Improve flying mode
Improve flying mode, part 2