Added ability to enable only while in-flight