some refactoring and added air traffic option