Removed use of array index and now use id for vehicle
Removed use of array index and now use id for vehicle