Made changes to rider/driver interaction