[WIP] more changes to support async flight-mode