Added rudimentary car-switching