Refactored & added passenger holder