diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
index aa58644ec4c68ed68c989f0a5b248280c4101141..5227ba879ee3b235a6d511298d39dec27cf8b68c 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T12:49:01.5988941Z",
+    "Date": "2016-10-13T10:06:43.0936564Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -15,21 +15,21 @@
     "CdA": 4.83,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "<NOFILE>",
+    "CdCorrFile": "",
     "Retarder": {
       "Type": "None",
       "Ratio": 0.0,
-      "File": "<NOFILE>"
+      "File": ""
     },
     "Angledrive": {
       "Type": "None",
       "Ratio": 0.0,
-      "LossMap": "<NOFILE>"
+      "LossMap": ""
     },
     "PTO": {
       "Type": "None",
-      "LossMap": "<NOFILE>",
-      "Cycle": "<NOFILE>"
+      "LossMap": "",
+      "Cycle": ""
     },
     "AxleConfig": {
       "Type": "4x2",
diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto
index eb4ebce11430e8f8191816b68823318ea26896e6..0de7a71b0bd3e3b202b7965af4bf8a88eca892ff 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto	
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck_DECL.vecto	
@@ -1,28 +1,23 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-28T14:59:23.9224105Z",
+    "Date": "2016-10-13T10:07:48.3396564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
+    "EngineOnlyMode": false,
     "VehicleFile": "Class2_RigidTruck.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "MT_6.vgbx",
-    "Cycles": [
-      "LongHaul",
-      "RegionalDelivery",
-      "UrbanDelivery"
-    ],
-    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [
       {
         "ID": "FAN",
         "Type": "Fan",
-        "Path": "<NOFILE>",
         "Technology": [
           "Crankshaft mounted - Bimetallic controlled visco clutch"
         ]
@@ -30,7 +25,6 @@
       {
         "ID": "STP",
         "Type": "Steering pump",
-        "Path": "<NOFILE>",
         "Technology": [
           "Fixed displacement with elec. control"
         ]
@@ -38,7 +32,6 @@
       {
         "ID": "AC",
         "Type": "HVAC",
-        "Path": "<NOFILE>",
         "Technology": [
           "Default"
         ]
@@ -46,7 +39,6 @@
       {
         "ID": "ES",
         "Type": "Electric System",
-        "Path": "<NOFILE>",
         "Technology": [
           "Standard technology"
         ]
@@ -54,30 +46,19 @@
       {
         "ID": "PS",
         "Type": "Pneumatic System",
-        "Path": "<NOFILE>",
         "Technology": [
           "Medium Supply 1-stage + ESS + AMS"
         ]
       }
     ],
-    "VACC": "<NOFILE>",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
       "MinTime": 5.0,
       "Delay": 5.0
     },
-    "LAC": {
-      "Enabled": true,
-      "PreviewDistanceFactor": 10.0,
-      "DF_offset": 2.5,
-      "DF_scaling": 1.5,
-      "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
-    },
     "OverSpeedEcoRoll": {
-      "Mode": "OverSpeed",
+      "Mode": "Overspeed",
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng
index 9cb748978b7a78d9e65d296ebfb528d4a4fb29eb..f10c2b595f3e0d850b503dcc6a99ed8574396aa5 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng	
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng	
@@ -1,14 +1,14 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T12:49:42.6348941Z",
+    "Date": "2016-10-13T10:06:50.6286564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
     "ModelName": "175kW 6.8l Engine",
-    "Displacement": 6871.0,
+    "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.56517,
     "FullLoadCurve": "175kW.vfld",
diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/MT_6.vgbx b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/MT_6.vgbx
index 0e2c9bfb5af7f829a04c4234cd41a27be36283ef..45172bccabbd3088bda716d799fb7e38da3bc72e 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/MT_6.vgbx	
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/MT_6.vgbx	
@@ -1,13 +1,13 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-28T14:58:48.6708857Z",
+    "Date": "2016-10-13T10:07:39.5626564Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
   "Body": {
     "SavedInDeclMode": true,
-    "ModelName": "Undefined",
+    "ModelName": "Generic 6speed MT GBX",
     "Inertia": 0.0,
     "TracInt": 2.0,
     "Gears": [
@@ -18,54 +18,48 @@
       {
         "Ratio": 6.7,
         "LossMap": "Gear_1.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 3.8,
         "LossMap": "Gear_2.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 2.29,
         "LossMap": "Gear_3.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.48,
         "LossMap": "Gear_4.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_5.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.73,
         "LossMap": "Gear_6.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       }
     ],
-    "TqReserve": 0.2,
-    "SkipGears": false,
+    "TqReserve": 20.0,
     "ShiftTime": 2.0,
-    "EaryShiftUp": false,
-    "StartTqReserve": 0.2,
+    "StartTqReserve": 20.0,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 0,
+    "GearboxType": "MT",
     "TorqueConverter": {
-      "Enabled": false,
-      "File": "<NOFILE>",
-      "RefRPM": 0.0,
-      "Inertia": 0.0,
-      "ShiftPolygon": ""
+      "Enabled": false
     },
     "DownshiftAferUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/AMT_12.vgbx b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/AMT_12.vgbx
index 813205201e5982af919db89fe0d7d913315443a3..3a278ff6d6ac337eae15f158b517a89fb5119ae2 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/AMT_12.vgbx	
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/AMT_12.vgbx	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-28T15:01:34.3184488Z",
+    "Date": "2016-10-13T10:08:16.0566564Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -18,90 +18,84 @@
       {
         "Ratio": 14.93,
         "LossMap": "Gear_1.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 11.64,
         "LossMap": "Gear_2.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 9.02,
         "LossMap": "Gear_3.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 7.04,
         "LossMap": "Gear_4.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 5.64,
         "LossMap": "Gear_5.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 4.4,
         "LossMap": "Gear_6.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 3.39,
         "LossMap": "Gear_7.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 2.65,
         "LossMap": "Gear_8.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 2.05,
         "LossMap": "Gear_9.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.6,
         "LossMap": "Gear_10.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.28,
         "LossMap": "Gear_11.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_12.vtlm",
-        "ShiftPolygon": "-",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       }
     ],
-    "TqReserve": 0.2,
-    "SkipGears": false,
+    "TqReserve": 20.0,
     "ShiftTime": 2.0,
-    "EaryShiftUp": false,
-    "StartTqReserve": 0.2,
+    "StartTqReserve": 20.0,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 1,
+    "GearboxType": "AMT",
     "TorqueConverter": {
-      "Enabled": false,
-      "File": "<NOFILE>",
-      "RefRPM": 0.0,
-      "Inertia": 0.0,
-      "ShiftPolygon": ""
+      "Enabled": false
     },
     "DownshiftAferUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh
index d5aeb2e408163a3e1057011d4210146d4d777bea..9853ba577c00dcdc3d168754d5111d8dcaa3b5af 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T12:52:52.6278941Z",
+    "Date": "2016-10-13T10:08:01.8366564Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -15,7 +15,7 @@
     "CdA": 5.3,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "<NOFILE>",
+    "CdCorrFile": "",
     "Retarder": {
       "Type": "secondary",
       "Ratio": 1.0,
@@ -24,12 +24,12 @@
     "Angledrive": {
       "Type": "None",
       "Ratio": 0.0,
-      "LossMap": "<NOFILE>"
+      "LossMap": ""
     },
     "PTO": {
       "Type": "None",
-      "LossMap": "<NOFILE>",
-      "Cycle": "<NOFILE>"
+      "LossMap": "",
+      "Cycle": ""
     },
     "AxleConfig": {
       "Type": "4x2",
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto
index 581ade7cc87560381d9cc6c2e221ceb1c69a9a46..9d8e26457327e1c6851c8282a8a9f9cd92d5660c 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto	
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto	
@@ -1,27 +1,23 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-28T15:01:38.5308700Z",
+    "Date": "2016-10-13T10:08:21.7776564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
+    "EngineOnlyMode": false,
     "VehicleFile": "Class5_Tractor.vveh",
     "EngineFile": "Engine_325kW_12.7l.veng",
     "GearboxFile": "AMT_12.vgbx",
-    "Cycles": [
-      "LongHaul",
-      "RegionalDelivery"
-    ],
-    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [
       {
         "ID": "FAN",
         "Type": "Fan",
-        "Path": "<NOFILE>",
         "Technology": [
           "Belt driven or driven via transm. - Electronically controlled visco clutch"
         ]
@@ -29,7 +25,6 @@
       {
         "ID": "STP",
         "Type": "Steering pump",
-        "Path": "<NOFILE>",
         "Technology": [
           "Fixed displacement with elec. control"
         ]
@@ -37,7 +32,6 @@
       {
         "ID": "AC",
         "Type": "HVAC",
-        "Path": "<NOFILE>",
         "Technology": [
           "Default"
         ]
@@ -45,7 +39,6 @@
       {
         "ID": "ES",
         "Type": "Electric System",
-        "Path": "<NOFILE>",
         "Technology": [
           "Standard technology"
         ]
@@ -53,30 +46,19 @@
       {
         "ID": "PS",
         "Type": "Pneumatic System",
-        "Path": "<NOFILE>",
         "Technology": [
           "Medium Supply 2-stage + ESS + AMS"
         ]
       }
     ],
-    "VACC": "<NOFILE>",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
       "MinTime": 5.0,
       "Delay": 5.0
     },
-    "LAC": {
-      "Enabled": true,
-      "PreviewDistanceFactor": 10.0,
-      "DF_offset": 2.5,
-      "DF_scaling": 1.5,
-      "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": ""
-    },
     "OverSpeedEcoRoll": {
-      "Mode": "OverSpeed",
+      "Mode": "Overspeed",
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
index fe0e061edee2f1d4214a5b74235e2b14cf499621..55a5ee68a38761cf48c6383aa641ab425eee9b6e 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng	
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng	
@@ -1,14 +1,14 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T12:53:18.2468941Z",
+    "Date": "2016-10-13T10:08:08.3476564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
     "ModelName": "325kW 12.7l Engine",
-    "Displacement": 12740.0,
+    "Displacement": "12740",
     "IdlingSpeed": 600.0,
     "Inertia": 5.1498,
     "FullLoadCurve": "325kW.vfld",
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 a9b4a7d80d5e3d9aff6844861e1253a992eaa7c5..9d1be9ef57fa69c6bd21e64e8d88dcb13dc0282b 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vecto	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vecto	
@@ -1,25 +1,22 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T09:05:12.7675264Z",
+    "Date": "2016-10-13T10:05:47.7226564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
+    "EngineOnlyMode": false,
     "VehicleFile": "CityBus_AT_PS.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "GearboxPowerSplit.vgbx",
-    "Cycles": [
-      "UrbanDelivery.vdri",
-      "RegionalDelivery.vdri"
-    ],
-    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
+    "Aux": [],
     "Padd": 3540.0,
     "VACC": "Driver.vacc",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
@@ -39,6 +36,10 @@
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
-    }
+    },
+    "Cycles": [
+      "UrbanDelivery.vdri",
+      "RegionalDelivery.vdri"
+    ]
   }
 }
\ No newline at end of file
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 08e7932624ea8b52dda73aaaa6e751e8100b1420..7d5e83d3e7c3f40cb2f542f761c9d53979a72b17 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vveh	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_PS.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T08:49:36.8805264Z",
+    "Date": "2016-10-13T09:11:58.0055687Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -15,21 +15,21 @@
     "CdA": 4.83,
     "rdyn": 421.0,
     "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "<NOFILE>",
+    "CdCorrFile": "",
     "Retarder": {
       "Type": "None",
       "Ratio": 0.0,
-      "File": "<NOFILE>"
+      "File": ""
     },
     "Angledrive": {
       "Type": "None",
       "Ratio": 0.0,
-      "LossMap": "<NOFILE>"
+      "LossMap": ""
     },
     "PTO": {
       "Type": "None",
-      "LossMap": "<NOFILE>",
-      "Cycle": "<NOFILE>"
+      "LossMap": "",
+      "Cycle": ""
     },
     "AxleConfig": {
       "Type": "4x2",
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 5ec4fe9b93a50de0bd0962bcfc9366b52dca4a6e..00a51392a3e8a527dc7c230365ed89bca5f328c7 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vecto	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vecto	
@@ -1,25 +1,22 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T09:04:26.9015264Z",
+    "Date": "2016-10-13T10:06:19.6886564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
+    "EngineOnlyMode": false,
     "VehicleFile": "CityBus_AT_Ser.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "GearboxSerial.vgbx",
-    "Cycles": [
-      "RegionalDelivery.vdri",
-      "UrbanDelivery.vdri"
-    ],
-    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
+    "Aux": [],
     "Padd": 3540.0,
     "VACC": "Driver.vacc",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
@@ -39,6 +36,10 @@
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
-    }
+    },
+    "Cycles": [
+      "RegionalDelivery.vdri",
+      "UrbanDelivery.vdri"
+    ]
   }
 }
\ No newline at end of file
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 56ead91f0e5ece96126c491ac3f6adb860fb327a..e9015588c11c0005a7f22b3b7b7572411f62054d 100644
--- a/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vveh	
+++ b/Generic Vehicles/Engineering Mode/CityBus_AT/CityBus_AT_Ser.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T08:48:40.2025264Z",
+    "Date": "2016-10-13T10:06:00.6206564Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -15,21 +15,21 @@
     "CdA": 4.83,
     "rdyn": 421.0,
     "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "<NOFILE>",
+    "CdCorrFile": "",
     "Retarder": {
       "Type": "None",
       "Ratio": 0.0,
-      "File": "<NOFILE>"
+      "File": ""
     },
     "Angledrive": {
       "Type": "None",
       "Ratio": 0.0,
-      "LossMap": "<NOFILE>"
+      "LossMap": ""
     },
     "PTO": {
       "Type": "None",
-      "LossMap": "<NOFILE>",
-      "Cycle": "<NOFILE>"
+      "LossMap": "",
+      "Cycle": ""
     },
     "AxleConfig": {
       "Type": "4x2",
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 0c5d67a5d95232f3150beccae7ac99a3f8896cc2..100b26e3d13290055fbd00e2686d6806da16ab50 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,18 +1,18 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T07:41:37.7290124Z",
+    "Date": "2016-10-13T10:06:05.1636564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
     "ModelName": "175kW 6.8l Engine",
-    "Displacement": 6871.0,
+    "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.565,
-    "FullLoadCurve": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class2_RigidTruck_4x2\\175kW.vfld",
-    "FuelMap": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class2_RigidTruck_4x2\\175kW.vmap",
+    "FullLoadCurve": "175kW.vfld",
+    "FuelMap": "175kW.vmap",
     "WHTC-Urban": 0.0,
     "WHTC-Rural": 0.0,
     "WHTC-Motorway": 0.0,
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxPowerSplit.vgbx b/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxPowerSplit.vgbx
index ae2e9558ea05df1e70da707dd43956fe0a5f836c..ecae75c233851357f606b0f99937f4eea6f3835e 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-09-29T09:03:41.9665264Z",
+    "Date": "2016-10-13T10:05:17.2366564Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -13,35 +13,33 @@
     "Gears": [
       {
         "Ratio": 5.8,
-        "Efficiency": "0.98"
+        "Efficiency": 0.98
       },
       {
         "Ratio": 1.35,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.73,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       }
     ],
     "TqReserve": 0.0,
-    "SkipGears": false,
     "ShiftTime": 0.0,
-    "EaryShiftUp": false,
     "StartTqReserve": 0.0,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 3,
+    "GearboxType": "ATPowerSplit",
     "TorqueConverter": {
       "Enabled": true,
       "File": "TorqueConverterPowerSplit.vtcc",
diff --git a/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxSerial.vgbx b/Generic Vehicles/Engineering Mode/CityBus_AT/GearboxSerial.vgbx
index aa3705e24ac5a44eddccc3b7e513fb6c3fa8149e..93fbbc4a5b5b08526c3c4d463bffe404cb660bc3 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-09-29T09:04:09.1415264Z",
+    "Date": "2016-10-13T10:06:12.8616564Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -13,53 +13,51 @@
     "Gears": [
       {
         "Ratio": 6.2,
-        "Efficiency": "0.98"
+        "Efficiency": 0.98
       },
       {
         "Ratio": 3.4,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.9,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.42,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.7,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.62,
-        "Efficiency": "0.98",
+        "Efficiency": 0.98,
         "ShiftPolygon": "AT-Shift.vgbs",
         "MaxTorque": ""
       }
     ],
     "TqReserve": 0.0,
-    "SkipGears": false,
     "ShiftTime": 0.0,
-    "EaryShiftUp": false,
     "StartTqReserve": 0.0,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 2,
+    "GearboxType": "ATSerial",
     "TorqueConverter": {
       "Enabled": true,
       "File": "TorqueConverter.vtcc",
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 de18c107532a6f36c7f3f6eb056d16ff19eb1b01..9d06b4875b5010db7a98338e2c3dbc83ac075756 100644
--- a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T07:38:45.1598602Z",
+    "Date": "2016-10-13T08:54:12.1194612Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -15,21 +15,21 @@
     "CdA": 4.83,
     "rdyn": 421.0,
     "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "<NOFILE>",
+    "CdCorrFile": "",
     "Retarder": {
       "Type": "None",
       "Ratio": 0.0,
-      "File": "<NOFILE>"
+      "File": ""
     },
     "Angledrive": {
       "Type": "None",
       "Ratio": 0.0,
-      "LossMap": "<NOFILE>"
+      "LossMap": ""
     },
     "PTO": {
       "Type": "None",
-      "LossMap": "<NOFILE>",
-      "Cycle": "<NOFILE>"
+      "LossMap": "",
+      "Cycle": ""
     },
     "AxleConfig": {
       "Type": "4x2",
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 51190ba903c9b26c50dd3232443f4454c742f7a9..3b97f5c414a40c52835f29460cfe2643fbbe6bf0 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,25 +1,22 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T08:51:53.3148941Z",
+    "Date": "2016-10-13T08:55:18.2100810Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
+    "EngineOnlyMode": false,
     "VehicleFile": "Class2_RigidTruck.vveh",
     "EngineFile": "Engine_175kW_6.8l.veng",
     "GearboxFile": "MT_6.vgbx",
-    "Cycles": [
-      "Regional_Delivery.vdri",
-      "Urban_Delivery.vdri"
-    ],
-    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
-    "AdvancedAuxiliaryFilePath": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class2_RigidTruck_4x2",
+    "AdvancedAuxiliaryFilePath": "",
+    "Aux": [],
     "Padd": 3540.0,
     "VACC": "Truck.vacc",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
@@ -39,6 +36,10 @@
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
-    }
+    },
+    "Cycles": [
+      "Regional_Delivery.vdri",
+      "Urban_Delivery.vdri"
+    ]
   }
 }
\ No newline at end of file
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 0c5d67a5d95232f3150beccae7ac99a3f8896cc2..d9c60344f343ba4367ccc97baa111ded999d9b8c 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,18 +1,18 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T07:41:37.7290124Z",
+    "Date": "2016-10-13T08:54:28.7387223Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
     "ModelName": "175kW 6.8l Engine",
-    "Displacement": 6871.0,
+    "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.565,
-    "FullLoadCurve": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class2_RigidTruck_4x2\\175kW.vfld",
-    "FuelMap": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class2_RigidTruck_4x2\\175kW.vmap",
+    "FullLoadCurve": "175kW.vfld",
+    "FuelMap": "175kW.vmap",
     "WHTC-Urban": 0.0,
     "WHTC-Rural": 0.0,
     "WHTC-Motorway": 0.0,
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 82d2f5690394906199aa40c9eb58d82ece9d38cd..37c91c0419dcf4868f6cc8fe351e5751f46f3cc2 100644
--- a/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/MT_6.vgbx	
+++ b/Generic Vehicles/Engineering Mode/Class2_RigidTruck_4x2/MT_6.vgbx	
@@ -1,13 +1,13 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-28T15:49:49.2539134Z",
+    "Date": "2016-10-13T08:55:11.0271885Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
   "Body": {
     "SavedInDeclMode": false,
-    "ModelName": "Undefined",
+    "ModelName": "6 Speed MT GBX",
     "Inertia": 0.0,
     "TracInt": 2.0,
     "Gears": [
@@ -18,54 +18,48 @@
       {
         "Ratio": 6.7,
         "LossMap": "Gear_1.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 3.8,
         "LossMap": "Gear_2.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 2.29,
         "LossMap": "Gear_3.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.48,
         "LossMap": "Gear_4.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_5.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.73,
         "LossMap": "Gear_6.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       }
     ],
     "TqReserve": 0.002,
-    "SkipGears": false,
     "ShiftTime": 2.0,
-    "EaryShiftUp": false,
     "StartTqReserve": 0.002,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 0,
+    "GearboxType": "MT",
     "TorqueConverter": {
-      "Enabled": false,
-      "File": "<NOFILE>",
-      "RefRPM": 0.0,
-      "Inertia": 0.0,
-      "ShiftPolygon": ""
+      "Enabled": false
     },
     "DownshiftAferUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,
diff --git a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/AMT_12.vgbx b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/AMT_12.vgbx
index cdcd1c92129037ab2dc165104926de3bf712da99..38edbe07b347a7b6158a904828418774fe5c9f89 100644
--- a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/AMT_12.vgbx	
+++ b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/AMT_12.vgbx	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (f513c787-07a6-4a67-8bd9-81abd760bcfc)",
-    "Date": "2016-07-04 17:24:04",
-    "AppVersion": "2.2",
-    "FileVersion": 5
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:56:56.3837105Z",
+    "AppVersion": "3",
+    "FileVersion": 6
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -18,101 +18,84 @@
       {
         "Ratio": 14.93,
         "LossMap": "Gear_1.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 11.64,
         "LossMap": "Gear_2.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 9.02,
         "LossMap": "Gear_3.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 7.04,
         "LossMap": "Gear_4.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 5.64,
         "LossMap": "Gear_5.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 4.4,
         "LossMap": "Gear_6.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 3.39,
         "LossMap": "Gear_7.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 2.65,
         "LossMap": "Gear_8.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 2.05,
         "LossMap": "Gear_9.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 1.6,
         "LossMap": "Gear_10.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 1.28,
         "LossMap": "Gear_11.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_12.vtlm",
-        "TCactive": false,
-        "ShiftPolygon": "<NOFILE>",
-        "FullLoadCurve": "<NOFILE>"
+        "ShiftPolygon": "",
+        "MaxTorque": ""
       }
     ],
     "TqReserve": 20.0,
-    "SkipGears": true,
-    "ShiftTime": 3,
-    "EaryShiftUp": true,
+    "ShiftTime": 3.0,
     "StartTqReserve": 20.0,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
     "GearboxType": "AMT",
     "TorqueConverter": {
-      "Enabled": false,
-      "File": "<NOFILE>",
-      "RefRPM": 0.0,
-      "Inertia": 0.0
+      "Enabled": false
     },
     "DownshiftAferUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,
diff --git a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck.vveh b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck.vveh
index 3c9f65932fb4e5e20a74ac0afb49a55e55473dd0..4b531ea0b049f47236800694936115f082b57f56 100644
--- a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-10-05T13:29:06.6680746Z",
+    "Date": "2016-10-13T08:55:55.2022477Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -32,7 +32,7 @@
       "Cycle": "PTO-cycle.vptoc"
     },
     "AxleConfig": {
-      "Type": "4x2",
+      "Type": "6x2",
       "Axles": [
         {
           "Inertia": 14.9,
diff --git a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vecto b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vecto
index 2f724f3680c3ad0c94f361f3b876daa525c1c8c7..f8ce30d8251c7e6a2e0ba80d3c89abd6acab1b38 100644
--- a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vecto	
+++ b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Class4_RigidTruck_ENG_PTO.vecto	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-10-05T13:31:02.2810746Z",
+    "Date": "2016-10-13T08:57:18.0113581Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
diff --git a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Engine_324kW_12.7l.veng b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Engine_324kW_12.7l.veng
index d98aee1d87be3264de66b25239386ff616c543da..e0d41f01225b45c44d09c359e47520f0cd34aff7 100644
--- a/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Engine_324kW_12.7l.veng	
+++ b/Generic Vehicles/Engineering Mode/Class4_RigidTruck_4x2_PTO/Engine_324kW_12.7l.veng	
@@ -1,20 +1,21 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (f513c787-07a6-4a67-8bd9-81abd760bcfc)",
-    "Date": "2016-07-04 14:33:46",
-    "AppVersion": "2.2",
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:56:18.5385785Z",
+    "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
-    "ModelName": "Undefined",
-    "Displacement": 7000.0,
+    "ModelName": "324kW 7l Engine",
+    "Displacement": "7000",
     "IdlingSpeed": 600.0,
     "Inertia": 5.14,
     "FullLoadCurve": "324kW.vfld",
     "FuelMap": "350kW.vmap",
     "WHTC-Urban": 0.0,
     "WHTC-Rural": 0.0,
-    "WHTC-Motorway": 0.0
+    "WHTC-Motorway": 0.0,
+    "ColdHotBalancingFactor": 1.0
   }
 }
\ 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 e1e697657e10753d65968e1904795b130cf1d015..216c531decf35f9426d89f435b23e7abc8135715 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-09-28T15:49:22.4492332Z",
+    "Date": "2016-10-13T08:52:52.1686119Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -18,90 +18,84 @@
       {
         "Ratio": 14.93,
         "LossMap": "Gear_1.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 11.64,
         "LossMap": "Gear_2.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 9.02,
         "LossMap": "Gear_3.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 7.04,
         "LossMap": "Gear_4.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 5.64,
         "LossMap": "Gear_5.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 4.4,
         "LossMap": "Gear_6.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 3.39,
         "LossMap": "Gear_7.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 2.65,
         "LossMap": "Gear_8.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 2.05,
         "LossMap": "Gear_9.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.6,
         "LossMap": "Gear_10.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.28,
         "LossMap": "Gear_11.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_12.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       }
     ],
-    "TqReserve": 0.002,
-    "SkipGears": false,
+    "TqReserve": 20.0,
     "ShiftTime": 2.0,
-    "EaryShiftUp": false,
-    "StartTqReserve": 0.002,
+    "StartTqReserve": 20.0,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 1,
+    "GearboxType": "AMT",
     "TorqueConverter": {
-      "Enabled": false,
-      "File": "<NOFILE>",
-      "RefRPM": 0.0,
-      "Inertia": 0.0,
-      "ShiftPolygon": ""
+      "Enabled": false
     },
     "DownshiftAferUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,
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 5ed4fad562435d16eb721be13b7536186492293b..f17d0e70355026004ae25a57dfa0957d58f26a94 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-10-12T12:37:45.6303874Z",
+    "Date": "2016-10-13T08:52:01.3737990Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
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 0d1c1ff474e58e9f56c5b5c8a5f13c7e14d4be7b..bcdb40660444ae8cc6f0f1282bbce96607e2b631 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,25 +1,22 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T09:21:04.4798941Z",
+    "Date": "2016-10-13T08:53:44.3008944Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
+    "EngineOnlyMode": false,
     "VehicleFile": "Class5_Tractor.vveh",
     "EngineFile": "Engine_325kW_12.7l.veng",
     "GearboxFile": "AMT_12.vgbx",
-    "Cycles": [
-      "Long_Haul.vdri",
-      "Regional_Delivery.vdri"
-    ],
-    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
+    "Aux": [],
     "Padd": 5000.0,
     "VACC": "Truck.vacc",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
@@ -39,6 +36,10 @@
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
-    }
+    },
+    "Cycles": [
+      "Long_Haul.vdri",
+      "Regional_Delivery.vdri"
+    ]
   }
 }
\ No newline at end of file
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 d1071e456a1a5db85d317406e65f1c96f586e9de..27be26b719707d4a9a1b74d05c646c0a70fe357e 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,18 +1,18 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-27T09:00:14.6108941Z",
+    "Date": "2016-10-13T08:52:20.2515417Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
     "ModelName": "325kW 12.7l Engine",
-    "Displacement": 12740.0,
+    "Displacement": "12740",
     "IdlingSpeed": 600.0,
     "Inertia": 5.1498,
-    "FullLoadCurve": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class5_Tractor_4x2\\325kW.vfld",
-    "FuelMap": "E:\\QUAM\\Workspace\\Projekt HUGO\\Generic\\ToJSON\\Class5_Tractor_4x2\\325kW.vmap",
+    "FullLoadCurve": "325kW.vfld",
+    "FuelMap": "325kW.vmap",
     "WHTC-Urban": 0.0,
     "WHTC-Rural": 0.0,
     "WHTC-Motorway": 0.0,
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 d2553183fbe59b9a351264bb54a18ea708089b6c..b839a2c57b4bc539b314aba250c49dc2dcf4a6e1 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,14 +1,14 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T06:26:17.6275264Z",
+    "Date": "2016-10-13T08:57:41.1155961Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
     "ModelName": "Generic 250kW Engine",
-    "Displacement": 7700.0,
+    "Displacement": "7700",
     "IdlingSpeed": 600.0,
     "Inertia": 3.789,
     "FullLoadCurve": "250kW.vfld",
diff --git a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh
index a7bc1c1eef19105edb7234527a1f2638b2b9f7c2..715939087edcc91a8546deb1671be59a20b62938 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh	
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T06:39:04.0725264Z",
+    "Date": "2016-10-13T08:57:32.3951093Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -15,7 +15,7 @@
     "CdA": 4.115,
     "rdyn": 507.0,
     "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "<NOFILE>",
+    "CdCorrFile": "",
     "Retarder": {
       "Type": "secondary",
       "Ratio": 1.0,
@@ -24,12 +24,12 @@
     "Angledrive": {
       "Type": "None",
       "Ratio": 0.0,
-      "LossMap": "<NOFILE>"
+      "LossMap": ""
     },
     "PTO": {
       "Type": "None",
-      "LossMap": "<NOFILE>",
-      "Cycle": "<NOFILE>"
+      "LossMap": "",
+      "Cycle": ""
     },
     "AxleConfig": {
       "Type": "6x2",
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 852d4000c78c479801e630d399cb649f20c99198..458127df097e887d813dedc78aa20233b7f3b308 100644
--- a/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus_ENG_AAUX.vecto	
+++ b/Generic Vehicles/Engineering Mode/InterurbanBus_AAUX/InterurbanBus_ENG_AAUX.vecto	
@@ -1,24 +1,22 @@
 {
   "Header": {
     "CreatedBy": " ()",
-    "Date": "2016-09-29T06:57:58.5885264Z",
+    "Date": "2016-10-13T10:28:40.9616564Z",
     "AppVersion": "3",
     "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
+    "EngineOnlyMode": false,
     "VehicleFile": "InterurbanBus.vveh",
     "EngineFile": "Engine_250kW_7.7l.veng",
     "GearboxFile": "MT_6_Bus.vgbx",
-    "Cycles": [
-      "Interurban.vdri"
-    ],
     "AuxiliaryAssembly": "BusAuxiliaries",
     "AuxiliaryVersion": "Version 1.0 Beta",
     "AdvancedAuxiliaryFilePath": "AdvancedAuxiliaries.AAUX",
+    "Aux": [],
     "Padd": 5000.0,
     "VACC": "Driver.vacc",
-    "EngineOnlyMode": false,
     "StartStop": {
       "Enabled": false,
       "MaxSpeed": 5.0,
@@ -38,6 +36,9 @@
       "MinSpeed": 50.0,
       "OverSpeed": 5.0,
       "UnderSpeed": 5.0
-    }
+    },
+    "Cycles": [
+      "Interurban.vdri"
+    ]
   }
 }
\ No newline at end of file
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 d94e1e23252a3477921512d3664d24ed6653e7ab..b91068b4e0203e7a93365678bedb8aa2e5624b1f 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-09-29T06:53:59.3425264Z",
+    "Date": "2016-10-13T08:57:53.6836213Z",
     "AppVersion": "3",
     "FileVersion": 6
   },
@@ -18,54 +18,48 @@
       {
         "Ratio": 3.36,
         "LossMap": "Gear_1.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.91,
         "LossMap": "Gear_2.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.42,
         "LossMap": "Gear_3.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 1.0,
         "LossMap": "Gear_4.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.72,
         "LossMap": "Gear_5.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       },
       {
         "Ratio": 0.62,
         "LossMap": "Gear_6.vtlm",
-        "ShiftPolygon": "<NOFILE>",
+        "ShiftPolygon": "",
         "MaxTorque": ""
       }
     ],
     "TqReserve": 0.2,
-    "SkipGears": false,
     "ShiftTime": 3.0,
-    "EaryShiftUp": false,
     "StartTqReserve": 0.2,
     "StartSpeed": 2.0,
     "StartAcc": 0.6,
-    "GearboxType": 0,
+    "GearboxType": "MT",
     "TorqueConverter": {
-      "Enabled": false,
-      "File": "<NOFILE>",
-      "RefRPM": 0.0,
-      "Inertia": 0.0,
-      "ShiftPolygon": ""
+      "Enabled": false
     },
     "DownshiftAferUpshiftDelay": 10.0,
     "UpshiftAfterDownshiftDelay": 10.0,