Heavily upgrade the preflight