[WIP] more changes to async flight-mode