refactored passenger