Updated logic with flight status.