updated with passenger capability