Updated according to changes in Flight 1.1.4.