Updated VehicleController