diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vecto b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vecto
index 811eb11c0c61d5dd9a7c6b06dba026415341bbf4..8ab3be06a56d86b2645db12716018129697948de 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vecto	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:05:47.7226564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:42.9254153Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,31 +11,40 @@
     "VehicleFile": "CityBus_AT_PS.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "GearboxPowerSplit.vgbx",
+    "TCU": "GearboxPowerSplit.vgbx",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [],
     "Padd": 3540.0,
     "VACC": "Acc_Citybus.vacc",
-    "StartStop": {
-      "Enabled": false,
-      "MaxSpeed": 5.0,
-      "MinTime": 5.0,
-      "Delay": 5.0
-    },
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
       "DF_offset": 2.5,
       "DF_scaling": 1.5,
       "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
     },
     "OverSpeedEcoRoll": {
       "Mode": "Off",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "UrbanDelivery.vdri",
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vveh b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vveh
index 7d5e83d3e7c3f40cb2f542f761c9d53979a72b17..cee31f7eb8e3092c5c2074ec45b8caa1912a8e0e 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vveh	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vveh	
@@ -1,18 +1,18 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T09:11:58.0055687Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:22.4497784Z",
     "AppVersion": "3",
-    "FileVersion": 7
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
     "VehCat": "CityBus",
+    "LegislativeClass": "Unknown",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
     "MassMax": 11.99,
-    "CdA": 4.83,
     "rdyn": 421.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +31,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 0.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +42,8 @@
           "AxleWeightShare": 0.4,
           "TwinTyres": false,
           "RRCISO": 0.0065,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 6.5,
@@ -48,9 +51,16 @@
           "AxleWeightShare": 0.6,
           "TwinTyres": true,
           "RRCISO": 0.0075,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleDriven"
         }
       ]
-    }
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 4.83,
+    "VehicleHeight": 0.0
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vecto b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vecto
index 2bc8adcfbc0d20ae368ec8eb1863ab698f2f622d..679325f7b163c34bdd169b60d18e314cd44b6db1 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vecto	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:19.6886564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:13.1142195Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,31 +11,40 @@
     "VehicleFile": "CityBus_AT_Ser.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "GearboxSerial.vgbx",
+    "TCU": "GearboxSerial.vgbx",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [],
     "Padd": 3540.0,
     "VACC": "Acc_Citybus.vacc",
-    "StartStop": {
-      "Enabled": false,
-      "MaxSpeed": 5.0,
-      "MinTime": 5.0,
-      "Delay": 5.0
-    },
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
       "DF_offset": 2.5,
       "DF_scaling": 1.5,
       "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
     },
     "OverSpeedEcoRoll": {
       "Mode": "Off",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "RegionalDelivery.vdri",
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vveh b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vveh
index e9015588c11c0005a7f22b3b7b7572411f62054d..58856d52f814edbc545769cac3b524a31c7104b0 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vveh	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vveh	
@@ -1,18 +1,18 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:00.6206564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:39:55.6980815Z",
     "AppVersion": "3",
-    "FileVersion": 7
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
     "VehCat": "CityBus",
+    "LegislativeClass": "Unknown",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
     "MassMax": 11.99,
-    "CdA": 4.83,
     "rdyn": 421.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +31,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 0.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +42,8 @@
           "AxleWeightShare": 0.4,
           "TwinTyres": false,
           "RRCISO": 0.0065,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 6.5,
@@ -48,9 +51,16 @@
           "AxleWeightShare": 0.6,
           "TwinTyres": true,
           "RRCISO": 0.0075,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleDriven"
         }
       ]
-    }
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 4.83,
+    "VehicleHeight": 0.0
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/Engine_175kW_6.8l.veng b/Generic Vehicles/Engineering Mode/CityBus_AT/Engine_175kW_6.8l.veng
index 100b26e3d13290055fbd00e2686d6806da16ab50..567289cefe83e1911bba8a5370aa34a51cbb1a5e 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/Engine_175kW_6.8l.veng	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/Engine_175kW_6.8l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:05.1636564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:29.7958140Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,11 +11,25 @@
     "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.565,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "175kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
     "FullLoadCurve": "175kW.vfld",
-    "FuelMap": "175kW.vmap",
-    "WHTC-Urban": 0.0,
-    "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0,
-    "ColdHotBalancingFactor": 0.0
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxPowerSplit.vgbx b/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxPowerSplit.vgbx
index 7da07fe0c178e056c13b65f4dfb1afbe961c4e71..a9683df79e191f0f3503a25e3ff2080eeffb75c4 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxPowerSplit.vgbx	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxPowerSplit.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:05:17.2366564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:39.6279816Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -19,19 +19,22 @@
         "Ratio": 1.35,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.0,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 0.73,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       }
     ],
     "TqReserve": 0.0,
@@ -43,12 +46,16 @@
     "TorqueConverter": {
       "Enabled": true,
       "File": "TorqueConverterPowerSplit.vtcc",
-      "RefRPM": 1000.0,
+      "RefRPM": 999.99999999999989,
       "Inertia": 0.0,
-      "ShiftPolygon": "AT-Shift.vgbs"
+      "MaxTCSpeed": 5000.0,
+      "ShiftPolygon": "AT-Shift.vgbs",
+      "CLUpshiftMinAcceleration": 0.0,
+      "CCUpshiftMinAcceleration": 0.0
     },
-    "DownshiftAferUpshiftDelay": 0.0,
+    "DownshiftAfterUpshiftDelay": 6.0,
     "UpshiftAfterDownshiftDelay": 0.0,
-    "UpshiftMinAcceleration": 0.0
+    "UpshiftMinAcceleration": 0.0,
+    "PowershiftShiftTime": 0.8
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxSerial.vgbx b/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxSerial.vgbx
index 42a6bf88d926ba879c5019905f01dad9ddcff52d..5d1dcfacc441cd9d64f8fd812c6187c3ebbeacef 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxSerial.vgbx	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxSerial.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:12.8616564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:06.5716004Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -19,37 +19,43 @@
         "Ratio": 3.4,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.9,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.42,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.0,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 0.7,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 0.62,
         "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       }
     ],
     "TqReserve": 0.0,
@@ -61,12 +67,16 @@
     "TorqueConverter": {
       "Enabled": true,
       "File": "TorqueConverter.vtcc",
-      "RefRPM": 1000.0,
+      "RefRPM": 999.99999999999989,
       "Inertia": 0.0,
-      "ShiftPolygon": "AT-Shift.vgbs"
+      "MaxTCSpeed": 5000.0,
+      "ShiftPolygon": "AT-Shift.vgbs",
+      "CLUpshiftMinAcceleration": 0.0,
+      "CCUpshiftMinAcceleration": 0.0
     },
-    "DownshiftAferUpshiftDelay": 0.0,
+    "DownshiftAfterUpshiftDelay": 6.0,
     "UpshiftAfterDownshiftDelay": 0.0,
-    "UpshiftMinAcceleration": 0.0
+    "UpshiftMinAcceleration": 0.0,
+    "PowershiftShiftTime": 0.8
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
index cb4448a6ecd1d90ef27df749ee17b848b081b279..3a8cb6dc87bd404473e5c49c4b187338b0c823a1 100644
--- a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
@@ -1,9 +1,9 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2017-07-13T14:14:29.3226830Z",
+    "Date": "2019-12-03T16:36:47.8686022Z",
     "AppVersion": "3",
-    "FileVersion": 7
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -74,6 +74,10 @@
         }
       ]
     },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
     "CdA": 4.83,
     "VehicleHeight": 3.0
   }
diff --git a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_ENG.vecto b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_ENG.vecto
index 3b97f5c414a40c52835f29460cfe2643fbbe6bf0..8989cd2f08493f9d8ec60daf4e76055c93519f65 100644
--- a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_ENG.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_ENG.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:55:18.2100810Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:37:15.1801162Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,31 +11,40 @@
     "VehicleFile": "Class2_RigidTruck.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "MT_6.vgbx",
+    "TCU": "MT_6.vgbx",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [],
     "Padd": 3540.0,
     "VACC": "Truck.vacc",
-    "StartStop": {
-      "Enabled": false,
-      "MaxSpeed": 5.0,
-      "MinTime": 5.0,
-      "Delay": 5.0
-    },
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
       "DF_offset": 2.5,
       "DF_scaling": 1.5,
       "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
     },
     "OverSpeedEcoRoll": {
       "Mode": "Off",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "Regional_Delivery.vdri",
diff --git a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng
index d9c60344f343ba4367ccc97baa111ded999d9b8c..817906accb972579ea2b9d4bace2aa5b210105f2 100644
--- a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng	
+++ b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:54:28.7387223Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:36:52.9140858Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,11 +11,25 @@
     "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.565,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "175kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
     "FullLoadCurve": "175kW.vfld",
-    "FuelMap": "175kW.vmap",
-    "WHTC-Urban": 0.0,
-    "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0,
-    "ColdHotBalancingFactor": 0.0
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/MT_6.vgbx b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/MT_6.vgbx
index edc4ca42db052b320b2cd3c4ba4f8c4893a1936b..491e0c2b93af9b802b4a88ff4b0661887a8bc028 100644
--- a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/MT_6.vgbx	
+++ b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/MT_6.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:55:11.0271885Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:37:01.0860127Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -19,37 +19,43 @@
         "Ratio": 6.7,
         "LossMap": "Gear_1.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 3.8,
         "LossMap": "Gear_2.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 2.29,
         "LossMap": "Gear_3.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.48,
         "LossMap": "Gear_4.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_5.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 0.73,
         "LossMap": "Gear_6.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       }
     ],
     "TqReserve": 20.0,
@@ -64,7 +70,6 @@
     "DownshiftAfterUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,
     "UpshiftMinAcceleration": 0.1,
-    "PowershiftShiftTime": 0.8,
-    "PowershiftInertiaFactor": 1.0
+    "PowershiftShiftTime": 0.8
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/AMT_12.vgbx b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/AMT_12.vgbx
index 216c531decf35f9426d89f435b23e7abc8135715..6207a888a22e6140de346b628f0ee7f3df57ca8a 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/AMT_12.vgbx	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/AMT_12.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:52:52.1686119Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:57:36.6421979Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -19,73 +19,85 @@
         "Ratio": 14.93,
         "LossMap": "Gear_1.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 11.64,
         "LossMap": "Gear_2.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 9.02,
         "LossMap": "Gear_3.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 7.04,
         "LossMap": "Gear_4.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 5.64,
         "LossMap": "Gear_5.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 4.4,
         "LossMap": "Gear_6.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 3.39,
         "LossMap": "Gear_7.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 2.65,
         "LossMap": "Gear_8.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 2.05,
         "LossMap": "Gear_9.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.6,
         "LossMap": "Gear_10.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.28,
         "LossMap": "Gear_11.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_12.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       }
     ],
     "TqReserve": 20.0,
@@ -97,8 +109,9 @@
     "TorqueConverter": {
       "Enabled": false
     },
-    "DownshiftAferUpshiftDelay": 10.0,
+    "DownshiftAfterUpshiftDelay": 6.0,
     "UpshiftAfterDownshiftDelay": 10.0,
-    "UpshiftMinAcceleration": 0.1
+    "UpshiftMinAcceleration": 0.1,
+    "PowershiftShiftTime": 0.8
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor.vveh b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor.vveh
index f17d0e70355026004ae25a57dfa0957d58f26a94..3602729e7e3ced9b439fca29a2144745c06c0dde 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
@@ -1,18 +1,18 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:52:01.3737990Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:56:30.4122138Z",
     "AppVersion": "3",
-    "FileVersion": 7
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
     "VehCat": "Tractor",
+    "LegislativeClass": "Unknown",
     "CurbWeight": 8229.0,
     "CurbWeightExtra": 7500.0,
     "Loading": 19300.0,
     "MassMax": 18.0,
-    "CdA": 5.3,
     "rdyn": 492.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +31,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 0.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +42,8 @@
           "AxleWeightShare": 0.2,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 14.9,
@@ -48,7 +51,8 @@
           "AxleWeightShare": 0.25,
           "TwinTyres": true,
           "RRCISO": 0.0065,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
         },
         {
           "Inertia": 19.2,
@@ -56,7 +60,8 @@
           "AxleWeightShare": 0.18333,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 41690.0
+          "FzISO": 41690.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 19.2,
@@ -64,7 +69,8 @@
           "AxleWeightShare": 0.18333,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 41690.0
+          "FzISO": 41690.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 19.2,
@@ -72,9 +78,16 @@
           "AxleWeightShare": 0.18334,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 41690.0
+          "FzISO": 41690.0,
+          "Type": "VehicleNonDriven"
         }
       ]
-    }
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 5.3,
+    "VehicleHeight": 0.0
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto
index 6f17db3c47ad3c98b1f18251bfe5a706cd6f844c..a16ab80d64c7efa4d80394d139206a1c8fb08cf0 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T15:52:04.0766564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:39:08.3882711Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,6 +11,8 @@
     "VehicleFile": "Class5_Tractor.vveh",
     "EngineFile": "Engine_325kW_12.7l.veng",
     "GearboxFile": "AMT_12.vgbx",
+    "TCU": "AMT_12.vgbx",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
@@ -24,25 +26,32 @@
     ],
     "Padd": 5000.0,
     "VACC": "Truck.vacc",
-    "StartStop": {
-      "Enabled": false,
-      "MaxSpeed": 5.0,
-      "MinTime": 5.0,
-      "Delay": 5.0
-    },
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
       "DF_offset": 2.5,
       "DF_scaling": 1.5,
       "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
     },
     "OverSpeedEcoRoll": {
       "Mode": "Off",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "Long_Haul+ES.vdri"
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR.vecto b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR.vecto
index 8851f4cde2d64d886e488fef24f39c48587e2a2d..3bbb1b3bf1ec8c84c2ba568ff5c83f00a465784e 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR.vecto	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2019-08-07T08:51:47.3653905Z",
+    "Date": "2019-12-03T16:56:49.9301535Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
@@ -11,10 +11,11 @@
     "VehicleFile": "Class5_Tractor.vveh",
     "EngineFile": "Engine_325kW_12.7l_WHR.veng",
     "GearboxFile": "AMT_12.vgbx",
+    "TCU": "ShiftParameters.vtcu",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
-	"TCU": "ShiftParameters.vtcu",
     "Aux": [
       {
         "ID": "ES",
@@ -28,6 +29,16 @@
     "EngineStopStartAtVehicleStopThreshold": 120.0,
     "EngineStopStartMaxOffTimespan": 120.0,
     "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
@@ -40,8 +51,7 @@
     "OverSpeedEcoRoll": {
       "Mode": "Off",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "Long_Haul+ES.vdri"
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS.vecto b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS.vecto
index 5161ca39a85a7b81f91d19c5169973d26533e5c2..2cf3577132821dad37ed808b262662c23c502d3f 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS.vecto	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2019-08-07T11:36:49.3518015Z",
+    "Date": "2019-12-03T16:57:18.9852337Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
@@ -11,10 +11,11 @@
     "VehicleFile": "Class5_Tractor_ESS.vveh",
     "EngineFile": "Engine_325kW_12.7l_WHR.veng",
     "GearboxFile": "AMT_12.vgbx",
+    "TCU": "ShiftParameters.vtcu",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
-	"TCU": "ShiftParameters.vtcu",
     "Aux": [
       {
         "ID": "ES",
@@ -28,6 +29,16 @@
     "EngineStopStartAtVehicleStopThreshold": 2.0,
     "EngineStopStartMaxOffTimespan": 120.0,
     "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
@@ -40,8 +51,7 @@
     "OverSpeedEcoRoll": {
       "Mode": "Overspeed",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "Long_Haul+ES.vdri"
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS_DF.vecto b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS_DF.vecto
index 5817d671a29ab86764795551b8f2502117045cc5..71a5e4153c297db4ad6be6dcada008bf66c69a86 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS_DF.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG_WHR_ESS_DF.vecto	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2019-08-07T15:15:30.9500516Z",
+    "Date": "2019-12-03T16:57:46.2025792Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
@@ -11,10 +11,11 @@
     "VehicleFile": "Class5_Tractor_ESS.vveh",
     "EngineFile": "Engine_325kW_12.7l_WHR_DF.veng",
     "GearboxFile": "AMT_12.vgbx",
+    "TCU": "ShiftParameters.vtcu",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
-	"TCU": "ShiftParameters.vtcu",
     "Aux": [
       {
         "ID": "ES",
@@ -28,6 +29,16 @@
     "EngineStopStartAtVehicleStopThreshold": 2.0,
     "EngineStopStartMaxOffTimespan": 120.0,
     "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
@@ -40,8 +51,7 @@
     "OverSpeedEcoRoll": {
       "Mode": "Overspeed",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "Long_Haul+ES.vdri"
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ESS.vveh b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ESS.vveh
index b2c8e66a69753730f2f84274b2e3ac15c5162ff4..638cb25256d48082b23556d0154c6d854130ac54 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ESS.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ESS.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2019-08-07T11:11:55.0948566Z",
+    "Date": "2019-12-03T16:57:28.8804657Z",
     "AppVersion": "3",
     "FileVersion": 8
   },
@@ -86,6 +86,7 @@
     "EngineStopStart": true,
     "EcoRoll": "WithEngineStop",
     "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
     "CdA": 5.3,
     "VehicleHeight": 0.0
   }
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
index 5e17fea53ff954bc854c36b7a0a11535cf0e828f..442b89d8563b5113a5a8ca94f975bcc5dbd796bf 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:52:20.2515417Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:38:47.5573891Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,12 +11,25 @@
     "Displacement": "12740",
     "IdlingSpeed": 600.0,
     "Inertia": 5.1498,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "325kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
     "FullLoadCurve": "325kW.vfld",
-    "FuelMap": "325kW.vmap",
-    "WHTC-Urban": 0.0,
-    "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0,
-    "WHTC-Engineering": 1.0,
-    "ColdHotBalancingFactor": 0.0
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR.veng b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR.veng
index 813f412e81703e1413ec59528f886ffebbe818b0..42c63793d8c83e4c8130cc13dd64b6aefac89af2 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR.veng	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR.veng	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2019-09-17T13:36:37.3154176Z",
+    "Date": "2019-12-03T16:57:06.0033855Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR_DF.veng b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR_DF.veng
index a12510e0346f959ff68b554565364ccd05bc8810..e610ea1914741647b8a9517e6a4aab5447e37d61 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR_DF.veng	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Engine_325kW_12.7l_WHR_DF.veng	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2019-09-17T13:37:57.2352607Z",
+    "Date": "2019-12-03T16:57:31.6048929Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
diff --git a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/AMT_12.vgbx b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/AMT_12.vgbx
index 38edbe07b347a7b6158a904828418774fe5c9f89..16af161a5474696407a1a8c45240eb4dfb301fe0 100644
--- a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/AMT_12.vgbx	
+++ b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/AMT_12.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:56:56.3837105Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:39:29.0086274Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -19,73 +19,85 @@
         "Ratio": 14.93,
         "LossMap": "Gear_1.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 11.64,
         "LossMap": "Gear_2.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 9.02,
         "LossMap": "Gear_3.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 7.04,
         "LossMap": "Gear_4.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 5.64,
         "LossMap": "Gear_5.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 4.4,
         "LossMap": "Gear_6.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 3.39,
         "LossMap": "Gear_7.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 2.65,
         "LossMap": "Gear_8.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 2.05,
         "LossMap": "Gear_9.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.6,
         "LossMap": "Gear_10.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.28,
         "LossMap": "Gear_11.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_12.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       }
     ],
     "TqReserve": 20.0,
@@ -97,8 +109,9 @@
     "TorqueConverter": {
       "Enabled": false
     },
-    "DownshiftAferUpshiftDelay": 10.0,
+    "DownshiftAfterUpshiftDelay": 6.0,
     "UpshiftAfterDownshiftDelay": 10.0,
-    "UpshiftMinAcceleration": 0.1
+    "UpshiftMinAcceleration": 0.1,
+    "PowershiftShiftTime": 0.8
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh
index 4b531ea0b049f47236800694936115f082b57f56..bdc5c7b84995cf7ac52eca4dd5d75051531ca0a1 100644
--- a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck.vveh	
@@ -1,18 +1,18 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:55:55.2022477Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:39:20.8991433Z",
     "AppVersion": "3",
-    "FileVersion": 7
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
     "VehCat": "RigidTruck",
+    "LegislativeClass": "Unknown",
     "CurbWeight": 9300.0,
     "CurbWeightExtra": 2200.0,
     "Loading": 7100.0,
     "MassMax": 26.0,
-    "CdA": 5.2,
     "rdyn": 492.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +31,8 @@
       "LossMap": "PTO-idle.vptol",
       "Cycle": "PTO-cycle.vptoc"
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 0.0,
     "AxleConfig": {
       "Type": "6x2",
       "Axles": [
@@ -40,7 +42,8 @@
           "AxleWeightShare": 0.35,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 14.9,
@@ -48,7 +51,8 @@
           "AxleWeightShare": 0.4,
           "TwinTyres": true,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
         },
         {
           "Inertia": 14.9,
@@ -56,9 +60,16 @@
           "AxleWeightShare": 0.25,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         }
       ]
-    }
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 5.2,
+    "VehicleHeight": 0.0
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO.vecto b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO.vecto
index 23228c92d8bae055a39673856f850ba3b651ffab..2ec689ae5bfaa9a60d831200579d0bfae404bee3 100644
--- a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Class9_RigidTruck_ENG_PTO.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:57:18.0113581Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:39:33.1264944Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,31 +11,40 @@
     "VehicleFile": "Class9_RigidTruck.vveh",
     "EngineFile": "Engine_324kW_12.7l.veng",
     "GearboxFile": "AMT_12.vgbx",
+    "TCU": "AMT_12.vgbx",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [],
     "Padd": 3500.0,
     "VACC": "Truck.vacc",
-    "StartStop": {
-      "Enabled": false,
-      "MaxSpeed": 5.0,
-      "MinTime": 5.0,
-      "Delay": 0.0
-    },
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
       "DF_offset": 2.5,
       "DF_scaling": 1.5,
       "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
     },
     "OverSpeedEcoRoll": {
       "Mode": "Overspeed",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 0.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "PTO_Collector.vdri"
diff --git a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Engine_324kW_12.7l.veng b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Engine_324kW_12.7l.veng
index e0d41f01225b45c44d09c359e47520f0cd34aff7..1d65682fbbafd50344c65f6e073d6587329ebdf9 100644
--- a/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Engine_324kW_12.7l.veng	
+++ b/Generic Vehicles/Engineering Mode/Class9_RigidTruck_6x2_PTO/Engine_324kW_12.7l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:56:18.5385785Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:39:23.9708723Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,11 +11,25 @@
     "Displacement": "7000",
     "IdlingSpeed": 600.0,
     "Inertia": 5.14,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 1.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "350kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
     "FullLoadCurve": "324kW.vfld",
-    "FuelMap": "350kW.vmap",
-    "WHTC-Urban": 0.0,
-    "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0,
-    "ColdHotBalancingFactor": 1.0
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/EngineOnly/EngineOnly.vecto b/Generic Vehicles/Engineering Mode/EngineOnly/EngineOnly.vecto
index cffef3a8bd6b0f397374334ff081eb0f5c07983c..3d9d68632fe44cb86d30d68d92eb3e3402340fcb 100644
--- a/Generic Vehicles/Engineering Mode/EngineOnly/EngineOnly.vecto	
+++ b/Generic Vehicles/Engineering Mode/EngineOnly/EngineOnly.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-14T08:06:35.5420151Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:41:24.1049714Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
diff --git a/Generic Vehicles/Engineering Mode/EngineOnly/Engine_175kW_6.8l.veng b/Generic Vehicles/Engineering Mode/EngineOnly/Engine_175kW_6.8l.veng
index d9c60344f343ba4367ccc97baa111ded999d9b8c..97f5fa35cdf671641ef4b6c0df0d998db7b73b14 100644
--- a/Generic Vehicles/Engineering Mode/EngineOnly/Engine_175kW_6.8l.veng	
+++ b/Generic Vehicles/Engineering Mode/EngineOnly/Engine_175kW_6.8l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:54:28.7387223Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:41:20.5388512Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,11 +11,25 @@
     "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.565,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "175kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
     "FullLoadCurve": "175kW.vfld",
-    "FuelMap": "175kW.vmap",
-    "WHTC-Urban": 0.0,
-    "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0,
-    "ColdHotBalancingFactor": 0.0
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/Engine_250kW_7.7l.veng b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/Engine_250kW_7.7l.veng
index b839a2c57b4bc539b314aba250c49dc2dcf4a6e1..74720a78761e857c43a775f03671d6ee4276fb96 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/Engine_250kW_7.7l.veng	
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/Engine_250kW_7.7l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:57:41.1155961Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:56.1296740Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,11 +11,25 @@
     "Displacement": "7700",
     "IdlingSpeed": 600.0,
     "Inertia": 3.789,
+    "Fuels": [
+      {
+        "WHTC-Urban": 0.0,
+        "WHTC-Rural": 0.0,
+        "WHTC-Motorway": 0.0,
+        "WHTC-Engineering": 1.0,
+        "ColdHotBalancingFactor": 0.0,
+        "CFRegPer": 1.0,
+        "FuelMap": "250kW.vmap",
+        "FuelType": "DieselCI"
+      }
+    ],
+    "RatedPower": 0.0,
+    "RatedSpeed": 0.0,
+    "MaxTorque": 0.0,
     "FullLoadCurve": "250kW.vfld",
-    "FuelMap": "250kW.vmap",
-    "WHTC-Urban": 0.0,
-    "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0,
-    "ColdHotBalancingFactor": 0.0
+    "WHRType": [
+      "None"
+    ],
+    "WHRCorrectionFactors": {}
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh
index 715939087edcc91a8546deb1671be59a20b62938..173a9f4df073832b793a74ac18e703d5b117879f 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh	
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh	
@@ -1,18 +1,18 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:57:32.3951093Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:40:50.9618833Z",
     "AppVersion": "3",
-    "FileVersion": 7
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
     "VehCat": "InterurbanBus",
+    "LegislativeClass": "Unknown",
     "CurbWeight": 14800.0,
     "CurbWeightExtra": 0.0,
     "Loading": 5170.0,
     "MassMax": 25.0,
-    "CdA": 4.115,
     "rdyn": 507.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +31,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 0.0,
     "AxleConfig": {
       "Type": "6x2",
       "Axles": [
@@ -40,7 +42,8 @@
           "AxleWeightShare": 0.2725,
           "TwinTyres": false,
           "RRCISO": 0.0065,
-          "FzISO": 31270.0
+          "FzISO": 31270.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 15.5,
@@ -48,7 +51,8 @@
           "AxleWeightShare": 0.455,
           "TwinTyres": true,
           "RRCISO": 0.0065,
-          "FzISO": 31270.0
+          "FzISO": 31270.0,
+          "Type": "VehicleDriven"
         },
         {
           "Inertia": 15.5,
@@ -56,9 +60,16 @@
           "AxleWeightShare": 0.2725,
           "TwinTyres": false,
           "RRCISO": 0.0065,
-          "FzISO": 31270.0
+          "FzISO": 31270.0,
+          "Type": "VehicleNonDriven"
         }
       ]
-    }
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "None",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 4.115,
+    "VehicleHeight": 0.0
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus_ENG_AAUX.vecto b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus_ENG_AAUX.vecto
index 458127df097e887d813dedc78aa20233b7f3b308..cbe3286bdff92a1d9f1e743661f849593ae9c418 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus_ENG_AAUX.vecto	
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus_ENG_AAUX.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:28:40.9616564Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:41:13.4608917Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,31 +11,40 @@
     "VehicleFile": "InterurbanBus.vveh",
     "EngineFile": "Engine_250kW_7.7l.veng",
     "GearboxFile": "MT_6_Bus.vgbx",
+    "TCU": "MT_6_Bus.vgbx",
+    "ShiftStrategy": "",
     "AuxiliaryAssembly": "BusAuxiliaries",
     "AuxiliaryVersion": "Version 1.0 Beta",
     "AdvancedAuxiliaryFilePath": "AdvancedAuxiliaries.AAUX",
     "Aux": [],
     "Padd": 5000.0,
     "VACC": "Driver.vacc",
-    "StartStop": {
-      "Enabled": false,
-      "MaxSpeed": 5.0,
-      "MinTime": 5.0,
-      "Delay": 5.0
-    },
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
     "LAC": {
       "Enabled": true,
       "PreviewDistanceFactor": 10.0,
       "DF_offset": 2.5,
       "DF_scaling": 1.5,
       "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
     },
     "OverSpeedEcoRoll": {
       "Mode": "Off",
       "MinSpeed": 50.0,
-      "OverSpeed": 5.0,
-      "UnderSpeed": 5.0
+      "OverSpeed": 5.0
     },
     "Cycles": [
       "Interurban.vdri"
diff --git a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/MT_6_Bus.vgbx b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/MT_6_Bus.vgbx
index b91068b4e0203e7a93365678bedb8aa2e5624b1f..021239c0f16f071d0c3a1172b2936f7d2bced84c 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/MT_6_Bus.vgbx	
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/MT_6_Bus.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:57:53.6836213Z",
+    "CreatedBy": "",
+    "Date": "2019-12-03T16:41:04.2644775Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -19,37 +19,43 @@
         "Ratio": 3.36,
         "LossMap": "Gear_1.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.91,
         "LossMap": "Gear_2.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.42,
         "LossMap": "Gear_3.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_4.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 0.72,
         "LossMap": "Gear_5.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       },
       {
         "Ratio": 0.62,
         "LossMap": "Gear_6.vtlm",
         "ShiftPolygon": "",
-        "MaxTorque": ""
+        "MaxTorque": "",
+        "MaxSpeed": ""
       }
     ],
     "TqReserve": 0.2,
@@ -61,8 +67,9 @@
     "TorqueConverter": {
       "Enabled": false
     },
-    "DownshiftAferUpshiftDelay": 10.0,
+    "DownshiftAfterUpshiftDelay": 6.0,
     "UpshiftAfterDownshiftDelay": 10.0,
-    "UpshiftMinAcceleration": 0.1
+    "UpshiftMinAcceleration": 0.1,
+    "PowershiftShiftTime": 0.8
   }
 }
\ No newline at end of file