Made changes so that different Vehicles can now work properly