Refactored to include passenger holder