Changes to add passengers(not finished)