Remove the need for passenger