Refactored passengers and added new take off rules