change inflight to use string as key of map