diff --git a/CHANGES.md b/CHANGES.md
index 7a24374e865ff5b5ac376f3f91b9dcfca591cebb..6f3db143112e5fb7e118133d7d495644b53a12e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,20 @@
 TODO
 * Traction interruption: No engine rev down - hold rpm until new gear engaged (Allison)
 
+### VECTO 2.2
+* Bugfix: Error in Declaration Mode Pneumatic System aux power calculation ([kW] were interpreted as [W])
+* Bugfix: Error in Declaration Mode Electric System aux power calculation
+* Moved gear-specific Full Load Curves to Gearbox File
+* Combined Drag Coefficient * Cross Sectional Area in one input parameter
+* Updated .vgbx file format (Added gear-specific Full Load Curves)
+* Updated .veng file format (Removed gear-specific Full Load Curves)
+* Updated .vveh file format (Combined Drag Coefficient * Cross Sectional Area in one parameter)
+* Updated Generic Vehicles (new file formats)
+* Removed WHTC Correction Factor Calculation. Now in external tool, VECTO-Engine.
+* Test Options are now only available in Engineering Mode
+* Gearbox Editor now shows generic and user-defined shift polygons (if available)
+* Various small updates in GUI
+
 ### VECTO 2.1.4
 * Bugfixes in start gear and (A)MT shift model
 * Updated Coach .vcdv file for higher speeds to avoid extrapolation
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
index 6b93f38a31754341338a98bcd5efc6b8b4be1d1e..92c360e6589c62c96aeca7e9b085484ddb2237d4 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto	
@@ -1,8 +1,8 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:58:58",
-    "AppVersion": "2.0.4-beta",
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "24.06.2015 12:03:58",
+    "AppVersion": "2.2 beta",
     "FileVersion": 2
   },
   "Body": {
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
index c1e59fbeae495fae19c73bd5db3e34906bc62927..96d53aa5f12a155d3351aa29344b6cbe0f1398a4 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:58:53",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 2
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 08:59:55",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,15 +11,10 @@
     "Displacement": 7700.0,
     "IdlingSpeed": 600.0,
     "Inertia": 3.789,
-    "FullLoadCurves": [
-      {
-        "Path": "12t Delivery Truck.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "12t Delivery Truck.vfld",
     "FuelMap": "12t Delivery Truck.vmap",
-    "WHTC-Urban": 215.0,
-    "WHTC-Rural": 202.0,
-    "WHTC-Motorway": 204.0
+    "WHTC-Urban": 0.99,
+    "WHTC-Rural": 0.99,
+    "WHTC-Motorway": 1.01
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx
index 71a6413e1fa53facffa7b50a50b8ff74023d655e..922993ec9fa7193115dfba9b6965be547e87cf62 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:58:58",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 4
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "24.06.2015 09:33:31",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -19,37 +19,43 @@
         "Ratio": 6.75,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 3.6,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 2.13,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.39,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.0,
         "LossMap": "Direct Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 0.78,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       }
     ],
     "TqReserve": 20.0,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
index 7e48eda364dafced678cd2d6f6ec778d42cd7f43..82da3a36d1b5b9d73d340b7feced5d770a039ad9 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:58:52",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 5
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "02.07.2015 13:55:36",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -12,12 +12,11 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 11.9,
-    "Cd": 0.6,
-    "CrossSecArea": 8.8,
+    "CdA": 5.28,
     "rdyn": 406.9297,
     "Rim": "15° DC Rims",
-    "CdCorrMode": "CdOfV",
-    "CdCorrFile": "12t Delivery Truck.vcdv",
+    "CdCorrMode": "CdOfVdecl",
+    "CdCorrFile": "<NOFILE>",
     "Retarder": {
       "Type": "None",
       "Ratio": 1.0,
@@ -28,7 +27,7 @@
       "Axles": [
         {
           "Inertia": 6.0,
-          "Wheels": "245/70 R 19.5",
+          "Wheels": "245/70 R19.5",
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.008343465,
@@ -36,7 +35,7 @@
         },
         {
           "Inertia": 6.0,
-          "Wheels": "245/70 R 19.5",
+          "Wheels": "245/70 R19.5",
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.00943769,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
index 9f3166c05f41576fb33fa529ea69aa1811a786ba..0e5b9b3eb574682a62d048c9e995fbe62e6e7694 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm	
@@ -6,7 +6,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,450,4.23,
 0,650,5.23,
 0,850,6.23,
-0,1050,7.23,
+0,1200,7.23,
 200,-350,4.126,
 200,-150,3.126,
 200,50,2.626,
@@ -14,7 +14,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,450,4.626,
 200,650,5.626,
 200,850,6.626,
-200,1050,7.626,
+200,1200,7.626,
 400,-350,4.522,
 400,-150,3.522,
 400,50,3.022,
@@ -22,7 +22,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,450,5.022,
 400,650,6.022,
 400,850,7.022,
-400,1050,8.022,
+400,1200,8.022,
 600,-350,4.918,
 600,-150,3.918,
 600,50,3.418,
@@ -30,7 +30,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,450,5.418,
 600,650,6.418,
 600,850,7.418,
-600,1050,8.418,
+600,1200,8.418,
 800,-350,5.314,
 800,-150,4.314,
 800,50,3.814,
@@ -38,7 +38,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,450,5.814,
 800,650,6.814,
 800,850,7.814,
-800,1050,8.814,
+800,1200,8.814,
 1000,-350,5.71,
 1000,-150,4.71,
 1000,50,4.21,
@@ -46,7 +46,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,450,6.21,
 1000,650,7.21,
 1000,850,8.21,
-1000,1050,9.21,
+1000,1200,9.21,
 1200,-350,6.106,
 1200,-150,5.106,
 1200,50,4.606,
@@ -54,7 +54,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,450,6.606,
 1200,650,7.606,
 1200,850,8.606,
-1200,1050,9.606,
+1200,1200,9.606,
 1400,-350,6.502,
 1400,-150,5.502,
 1400,50,5.002,
@@ -62,7 +62,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,450,7.002,
 1400,650,8.002,
 1400,850,9.002,
-1400,1050,10.002,
+1400,1200,10.002,
 1600,-350,6.898,
 1600,-150,5.898,
 1600,50,5.398,
@@ -70,7 +70,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,450,7.398,
 1600,650,8.398,
 1600,850,9.398,
-1600,1050,10.398,
+1600,1200,10.398,
 1800,-350,7.294,
 1800,-150,6.294,
 1800,50,5.794,
@@ -78,7 +78,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,450,7.794,
 1800,650,8.794,
 1800,850,9.794,
-1800,1050,10.794,
+1800,1200,10.794,
 2000,-350,7.69,
 2000,-150,6.69,
 2000,50,6.19,
@@ -86,7 +86,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,450,8.19,
 2000,650,9.19,
 2000,850,10.19,
-2000,1050,11.19,
+2000,1200,11.19,
 2200,-350,8.086,
 2200,-150,7.086,
 2200,50,6.586,
@@ -94,7 +94,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2200,450,8.586,
 2200,650,9.586,
 2200,850,10.586,
-2200,1050,11.586,
+2200,1200,11.586,
 2400,-350,8.482,
 2400,-150,7.482,
 2400,50,6.982,
@@ -102,7 +102,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2400,450,8.982,
 2400,650,9.982,
 2400,850,10.982,
-2400,1050,11.982,
+2400,1200,11.982,
 0,-1000,6.98,
 200,-1000,7.376,
 400,-1000,7.772,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
index 4171bb62973f8d3453853eebd65bc16050d07d07..d687a85bf5d2c1d243a66f41a44d334381724a51 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm	
@@ -7,7 +7,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,650,14.98,
 0,850,18.98,
 0,1050,22.98,
-0,1250,27
+0,1600,27
 200,-350,9.376,
 200,-150,5.376,
 200,50,3.376,
@@ -16,7 +16,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,650,15.376,
 200,850,19.376,
 200,1050,23.376,
-200,1250,28
+200,1600,28
 400,-350,9.772,
 400,-150,5.772,
 400,50,3.772,
@@ -25,7 +25,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,650,15.772,
 400,850,19.772,
 400,1050,23.772,
-400,1250,28
+400,1600,28
 600,-350,10.168,
 600,-150,6.168,
 600,50,4.168,
@@ -34,7 +34,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,650,16.168,
 600,850,20.168,
 600,1050,24.168,
-600,1250,28.8
+600,1600,28.8
 800,-350,10.564,
 800,-150,6.564,
 800,50,4.564,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,650,16.564,
 800,850,20.564,
 800,1050,24.564,
-800,1250,29
+800,1600,29
 1000,-350,10.96,
 1000,-150,6.96,
 1000,50,4.96,
@@ -52,7 +52,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,650,16.96,
 1000,850,20.96,
 1000,1050,24.96,
-1000,1250,30
+1000,1600,30
 1200,-350,11.356,
 1200,-150,7.356,
 1200,50,5.356,
@@ -61,7 +61,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,650,17.356,
 1200,850,21.356,
 1200,1050,25.356,
-1200,1250,30
+1200,1600,30
 1400,-350,11.752,
 1400,-150,7.752,
 1400,50,5.752,
@@ -70,7 +70,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,650,17.752,
 1400,850,21.752,
 1400,1050,25.752,
-1400,1250,31
+1400,1600,31
 1600,-350,12.148,
 1600,-150,8.148,
 1600,50,6.148,
@@ -79,7 +79,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,650,18.148,
 1600,850,22.148,
 1600,1050,26.148,
-1600,1250,31
+1600,1600,31
 1800,-350,12.544,
 1800,-150,8.544,
 1800,50,6.544,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,650,18.544,
 1800,850,22.544,
 1800,1050,26.544,
-1800,1250,32
+1800,1600,32
 2000,-350,12.94,
 2000,-150,8.94,
 2000,50,6.94,
@@ -97,7 +97,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,650,18.94,
 2000,850,22.94,
 2000,1050,26.94,
-2000,1250,32
+2000,1600,32
 2200,-350,13.336,
 2200,-150,9.336,
 2200,50,7.336,
@@ -106,7 +106,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2200,650,19.336,
 2200,850,23.336,
 2200,1050,27.336,
-2200,1250,33
+2200,1600,33
 2400,-350,13.732,
 2400,-150,9.732,
 2400,50,7.732,
@@ -115,7 +115,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2400,650,19.732,
 2400,850,23.732,
 2400,1050,27.732,
-2400,1250,33
+2400,1600,33
 0,-1000,21.98,
 200,-1000,22.376,
 400,-1000,22.772,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
index 29f208aeeeaa81bf66fb9467ecd4077f6364bb0d..dd2d8f88db32c1b1e066751efabdfe651f53105a 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:04",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 2
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 09:02:39",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,15 +11,10 @@
     "Displacement": 12730.0,
     "IdlingSpeed": 560.0,
     "Inertia": 5.1471,
-    "FullLoadCurves": [
-      {
-        "Path": "40t_Long_Haul_Truck.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
     "FuelMap": "40t_Long_Haul_Truck.vmap",
-    "WHTC-Urban": 199.84,
-    "WHTC-Rural": 192.89,
-    "WHTC-Motorway": 193.155
+    "WHTC-Urban": 0.97,
+    "WHTC-Rural": 0.99,
+    "WHTC-Motorway": 1.02
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx
index 3ac2c59374c2271c30f7cfb308fdc97711a08c26..06e29aa330a095f98b2e2cf8d43fbc5725d109a2 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:06",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 4
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "24.06.2015 09:43:54",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -19,73 +19,85 @@
         "Ratio": 14.93,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 11.64,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 9.02,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 7.04,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 5.64,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 4.4,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 3.39,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 2.65,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 2.05,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.6,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.28,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.0,
         "LossMap": "Direct Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
       }
     ],
     "TqReserve": 20.0,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
index 41d41402bb0d2ef0d8163f3dafdb1d78ed4b6704..b292f7ecb61b4c26ab91c7f0d65074c1d0630597 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:03",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 5
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "02.07.2015 13:55:39",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -12,12 +12,11 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 40.0,
-    "Cd": 0.663,
-    "CrossSecArea": 9.5,
+    "CdA": 6.2985,
     "rdyn": 488.2675,
     "Rim": "5° DC Rims",
-    "CdCorrMode": "CdOfV",
-    "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
+    "CdCorrMode": "CdOfVdecl",
+    "CdCorrFile": "<NOFILE>",
     "Retarder": {
       "Type": "Secondary",
       "Ratio": 1.0,
@@ -28,7 +27,7 @@
       "Axles": [
         {
           "Inertia": 14.9,
-          "Wheels": "315/70 R 22.5",
+          "Wheels": "315/70 R22.5",
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.00555,
@@ -36,7 +35,7 @@
         },
         {
           "Inertia": 14.9,
-          "Wheels": "315/70 R 22.5",
+          "Wheels": "315/70 R22.5",
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.00628,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
index 938654e43e6b82ca1be9b9948176db24f95857af..fa171bece8e04fad0fd78574764f3a4f17465444 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm	
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 0,1850,14.31
 0,2050,15.31
 0,2250,16.31
-0,2450,17.31
+0,2800,17.31
 100,-350,7.316
 100,-150,6.316
 100,50,5.816
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 100,1850,14.816
 100,2050,15.816
 100,2250,16.816
-100,2450,17.816
+100,2800,17.816
 300,-350,8.328
 300,-150,7.328
 300,50,6.828
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 300,1850,15.828
 300,2050,16.828
 300,2250,17.828
-300,2450,18.828
+300,2800,18.828
 500,-350,9.34
 500,-150,8.34
 500,50,7.84
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 500,1850,16.84
 500,2050,17.84
 500,2250,18.84
-500,2450,19.84
+500,2800,19.84
 700,-350,10.352
 700,-150,9.352
 700,50,8.852
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 700,1850,17.852
 700,2050,18.852
 700,2250,19.852
-700,2450,20.852
+700,2800,20.852
 900,-350,11.364
 900,-150,10.364
 900,50,9.864
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 900,1850,18.864
 900,2050,19.864
 900,2250,20.864
-900,2450,21.864
+900,2800,21.864
 1100,-350,12.376
 1100,-150,11.376
 1100,50,10.876
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1100,1850,19.876
 1100,2050,20.876
 1100,2250,21.876
-1100,2450,22.876
+1100,2800,22.876
 1300,-350,13.388
 1300,-150,12.388
 1300,50,11.888
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1300,1850,20.888
 1300,2050,21.888
 1300,2250,22.888
-1300,2450,23.888
+1300,2800,23.888
 1500,-350,14.4
 1500,-150,13.4
 1500,50,12.9
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1500,1850,21.9
 1500,2050,22.9
 1500,2250,23.9
-1500,2450,24.9
+1500,2800,24.9
 1700,-350,15.412
 1700,-150,14.412
 1700,50,13.912
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1700,1850,22.912
 1700,2050,23.912
 1700,2250,24.912
-1700,2450,25.912
+1700,2800,25.912
 1900,-350,16.424
 1900,-150,15.424
 1900,50,14.924
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1900,1850,23.924
 1900,2050,24.924
 1900,2250,25.924
-1900,2450,26.924
+1900,2800,26.924
 2100,-350,17.436
 2100,-150,16.436
 2100,50,15.936
@@ -178,7 +178,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 2100,1850,24.936
 2100,2050,25.936
 2100,2250,26.936
-2100,2450,27.936
+2100,2800,27.936
 0,-1000,10.06
 100,-1000,10.566
 300,-1000,11.578
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
index e92c034837149aeb694dbdc917bd70e0eaf5fb78..0198efcc3633373b82fdd76362e1b2080f0dbd1e 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm	
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 0,1850,42.06
 0,2050,46.06
 0,2250,50.06
-0,2450,54.06
+0,3000,54.06
 100,-350,12.566
 100,-150,8.566
 100,50,6.566
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 100,1850,42.566
 100,2050,46.566
 100,2250,50.566
-100,2450,54.566
+100,3000,54.566
 300,-350,13.578
 300,-150,9.578
 300,50,7.578
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 300,1850,43.578
 300,2050,47.578
 300,2250,51.578
-300,2450,55.578
+300,3000,55.578
 500,-350,14.59
 500,-150,10.59
 500,50,8.59
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 500,1850,44.59
 500,2050,48.59
 500,2250,52.59
-500,2450,56.59
+500,3000,56.59
 700,-350,15.602
 700,-150,11.602
 700,50,9.602
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 700,1850,45.602
 700,2050,49.602
 700,2250,53.602
-700,2450,57.602
+700,3000,57.602
 900,-350,16.614
 900,-150,12.614
 900,50,10.614
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 900,1850,46.614
 900,2050,50.614
 900,2250,54.614
-900,2450,58.614
+900,3000,58.614
 1100,-350,17.626
 1100,-150,13.626
 1100,50,11.626
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1100,1850,47.626
 1100,2050,51.626
 1100,2250,55.626
-1100,2450,59.626
+1100,3000,59.626
 1300,-350,18.638
 1300,-150,14.638
 1300,50,12.638
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1300,1850,48.638
 1300,2050,52.638
 1300,2250,56.638
-1300,2450,60.638
+1300,3000,60.638
 1500,-350,19.65
 1500,-150,15.65
 1500,50,13.65
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1500,1850,49.65
 1500,2050,53.65
 1500,2250,57.65
-1500,2450,61.65
+1500,3000,61.65
 1700,-350,20.662
 1700,-150,16.662
 1700,50,14.662
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1700,1850,50.662
 1700,2050,54.662
 1700,2250,58.662
-1700,2450,62.662
+1700,3000,62.662
 1900,-350,21.674
 1900,-150,17.674
 1900,50,15.674
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1900,1850,51.674
 1900,2050,55.674
 1900,2250,59.674
-1900,2450,63.674
+1900,3000,63.674
 2100,-350,22.686
 2100,-150,18.686
 2100,50,16.686
@@ -178,7 +178,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 2100,1850,52.686
 2100,2050,56.686
 2100,2250,60.686
-2100,2450,64.686
+2100,3000,64.686
 0,-1000,25.06
 100,-1000,25.566
 300,-1000,26.578
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
index 45a0b3979f2f8d29b2d3a92f12b39b456640a3a2..d93e66348bbf92fc91f80d7b24ae03ebc3a936e6 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng	
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:15",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 2
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 11:23:22",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,12 +11,7 @@
     "Displacement": 12730.0,
     "IdlingSpeed": 560.0,
     "Inertia": 3.8,
-    "FullLoadCurves": [
-      {
-        "Path": "24t Coach.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "24t Coach.vfld",
     "FuelMap": "24t Coach.vmap",
     "WHTC-Urban": 0.0,
     "WHTC-Rural": 0.0,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
index 4fdb98db9eb0733d6cfc34bc5690dbac238e7b57..88dc64fa30a3e285fe6f52302b467ca37aa6e670 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx	
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:17",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 4
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 11:23:31",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -19,49 +19,57 @@
         "Ratio": 6.38,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 4.63,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 3.44,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 2.59,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.86,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.35,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.0,
         "LossMap": "Direct Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 0.76,
         "LossMap": "Indirect Gear.vtlm",
         "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       }
     ],
     "TqReserve": 20.0,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
index cf5749149de0e54e9c5f8bb2f20ac5320dd7a993..4aee343895310245e7993cc17e4eda720eff652d 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh	
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:13",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 5
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "02.07.2015 13:55:46",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -12,11 +12,10 @@
     "CurbWeightExtra": 0.0,
     "Loading": 3300.0,
     "MassMax": 24.0,
-    "Cd": 0.441,
-    "CrossSecArea": 7.4,
+    "CdA": 3.2634,
     "rdyn": 520.0,
     "Rim": "-",
-    "CdCorrMode": "CdOfV",
+    "CdCorrMode": "CdOfVeng",
     "CdCorrFile": "24t Coach.vcdv",
     "Retarder": {
       "Type": "Secondary",
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
index f01578ad9e3711612d374a7b4fe9ad6b667438da..b9f1d570fd723147219b4eef1070be13da07092b 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm	
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm	
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,1850,14.31,
 0,2050,15.31,
 0,2250,16.31,
-0,2450,17.31,
+0,2700,17.31,
 200,-350,7.822,
 200,-150,6.822,
 200,50,6.322,
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,1850,15.322,
 200,2050,16.322,
 200,2250,17.322,
-200,2450,18.322,
+200,2700,18.322,
 400,-350,8.834,
 400,-150,7.834,
 400,50,7.334,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,1850,16.334,
 400,2050,17.334,
 400,2250,18.334,
-400,2450,19.334,
+400,2700,19.334,
 600,-350,9.846,
 600,-150,8.846,
 600,50,8.346,
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,1850,17.346,
 600,2050,18.346,
 600,2250,19.346,
-600,2450,20.346,
+600,2700,20.346,
 800,-350,10.858,
 800,-150,9.858,
 800,50,9.358,
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,1850,18.358,
 800,2050,19.358,
 800,2250,20.358,
-800,2450,21.358,
+800,2700,21.358,
 1000,-350,11.87,
 1000,-150,10.87,
 1000,50,10.37,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,1850,19.37,
 1000,2050,20.37,
 1000,2250,21.37,
-1000,2450,22.37,
+1000,2700,22.37,
 1200,-350,12.882,
 1200,-150,11.882,
 1200,50,11.382,
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,1850,20.382,
 1200,2050,21.382,
 1200,2250,22.382,
-1200,2450,23.382,
+1200,2700,23.382,
 1400,-350,13.894,
 1400,-150,12.894,
 1400,50,12.394,
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,1850,21.394,
 1400,2050,22.394,
 1400,2250,23.394,
-1400,2450,24.394,
+1400,2700,24.394,
 1600,-350,14.906,
 1600,-150,13.906,
 1600,50,13.406,
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,1850,22.406,
 1600,2050,23.406,
 1600,2250,24.406,
-1600,2450,25.406,
+1600,2700,25.406,
 1800,-350,15.918,
 1800,-150,14.918,
 1800,50,14.418,
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,1850,23.418,
 1800,2050,24.418,
 1800,2250,25.418,
-1800,2450,26.418,
+1800,2700,26.418,
 2000,-350,16.93,
 2000,-150,15.93,
 2000,50,15.43,
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,1850,24.43,
 2000,2050,25.43,
 2000,2250,26.43,
-2000,2450,27.43,
+2000,2700,27.43,
 0,-1000,10.06,
 200,-1000,11.072,
 400,-1000,12.084,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
index 90e4beee5b235671a0500dbd9f28ff2b3dd73236..900961da991e7800a416d35091b664e2b92673d9 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm	
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm	
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,1850,42.06,
 0,2050,46.06,
 0,2250,50.06,
-0,2450,54.06,
+0,2700,54.06,
 200,-350,13.072,
 200,-150,9.072,
 200,50,7.072,
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,1850,43.072,
 200,2050,47.072,
 200,2250,51.072,
-200,2450,55.072,
+200,2700,55.072,
 400,-350,14.084,
 400,-150,10.084,
 400,50,8.084,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,1850,44.084,
 400,2050,48.084,
 400,2250,52.084,
-400,2450,56.084,
+400,2700,56.084,
 600,-350,15.096,
 600,-150,11.096,
 600,50,9.096,
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,1850,45.096,
 600,2050,49.096,
 600,2250,53.096,
-600,2450,57.096,
+600,2700,57.096,
 800,-350,16.108,
 800,-150,12.108,
 800,50,10.108,
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,1850,46.108,
 800,2050,50.108,
 800,2250,54.108,
-800,2450,58.108,
+800,2700,58.108,
 1000,-350,17.12,
 1000,-150,13.12,
 1000,50,11.12,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,1850,47.12,
 1000,2050,51.12,
 1000,2250,55.12,
-1000,2450,59.12,
+1000,2700,59.12,
 1200,-350,18.132,
 1200,-150,14.132,
 1200,50,12.132,
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,1850,48.132,
 1200,2050,52.132,
 1200,2250,56.132,
-1200,2450,60.132,
+1200,2700,60.132,
 1400,-350,19.144,
 1400,-150,15.144,
 1400,50,13.144,
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,1850,49.144,
 1400,2050,53.144,
 1400,2250,57.144,
-1400,2450,61.144,
+1400,2700,61.144,
 1600,-350,20.156,
 1600,-150,16.156,
 1600,50,14.156,
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,1850,50.156,
 1600,2050,54.156,
 1600,2250,58.156,
-1600,2450,62.156,
+1600,2700,62.156,
 1800,-350,21.168,
 1800,-150,17.168,
 1800,50,15.168,
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,1850,51.168,
 1800,2050,55.168,
 1800,2250,59.168,
-1800,2450,63.168,
+1800,2700,63.168,
 2000,-350,22.18,
 2000,-150,18.18,
 2000,50,16.18,
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,1850,52.18,
 2000,2050,56.18,
 2000,2250,60.18,
-2000,2450,64.18,
+2000,2700,64.18,
 0,-1000,25.06,
 200,-1000,26.072,
 400,-1000,27.084,
diff --git a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng
index 80aa1489f02f292c570c5ed7eea99b040d0f4728..87cae4ef3a6a803d0f4577b1a86c42f981ce7094 100644
--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng	
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
     "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
-    "Date": "22.04.2015 15:19:42",
-    "AppVersion": "2.1",
-    "FileVersion": 2
+    "Date": "25.06.2015 11:23:46",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -11,12 +11,7 @@
     "Displacement": 7700.0,
     "IdlingSpeed": 600.0,
     "Inertia": 3.8,
-    "FullLoadCurves": [
-      {
-        "Path": "FullLoad.vfld",
-        "Gears": "0-99"
-      }
-    ],
+    "FullLoadCurve": "FullLoad.vfld",
     "FuelMap": "FCMap.vmap",
     "WHTC-Urban": 0.0,
     "WHTC-Rural": 0.0,
diff --git a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx
index 8d2b9a1a42512ca9d955c5ff6fd980d46377d322..acac788219306ad4928220866b6f7878227a5a16 100644
--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx	
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx	
@@ -1,9 +1,9 @@
 {
   "Header": {
     "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
-    "Date": "22.04.2015 15:19:44",
-    "AppVersion": "2.1",
-    "FileVersion": 4
+    "Date": "25.06.2015 11:23:52",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -19,25 +19,29 @@
         "Ratio": 3.0,
         "Efficiency": "0.96",
         "TCactive": true,
-        "ShiftPolygon": "AT-Shift.vgbs"
+        "ShiftPolygon": "AT-Shift.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 3.0,
         "Efficiency": "0.96",
         "TCactive": false,
-        "ShiftPolygon": "AT-Shift.vgbs"
+        "ShiftPolygon": "AT-Shift.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 1.0,
         "Efficiency": "0.98",
         "TCactive": false,
-        "ShiftPolygon": "AT-Shift.vgbs"
+        "ShiftPolygon": "AT-Shift.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       },
       {
         "Ratio": 0.8,
         "Efficiency": "0.96",
         "TCactive": false,
-        "ShiftPolygon": "AT-Shift.vgbs"
+        "ShiftPolygon": "AT-Shift.vgbs",
+        "FullLoadCurve": "<NOFILE>"
       }
     ],
     "TqReserve": 5.0,
diff --git a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh
index 559e14fbb9931d74d0e271909c80206103aa5785..e53bfe5a25b67d6456166e60e39a9150871d77db 100644
--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh	
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh	
@@ -1,9 +1,9 @@
 {
   "Header": {
     "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
-    "Date": "22.04.2015 15:19:41",
-    "AppVersion": "2.1",
-    "FileVersion": 5
+    "Date": "02.07.2015 13:55:50",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -12,8 +12,7 @@
     "CurbWeightExtra": 0.0,
     "Loading": 2000.0,
     "MassMax": 18.0,
-    "Cd": 0.67,
-    "CrossSecArea": 8.0,
+    "CdA": 5.36,
     "rdyn": 465.0,
     "Rim": "-",
     "CdCorrMode": "Off",
diff --git a/User Manual Source/JIRA Quick Start Guide.docx b/User Manual Source/JIRA Quick Start Guide.docx
new file mode 100644
index 0000000000000000000000000000000000000000..b869a6a4e10e349f972d32adb10ba5f0a4c28088
Binary files /dev/null and b/User Manual Source/JIRA Quick Start Guide.docx differ
diff --git a/User Manual Source/JIRA Quick Start Guide.pdf b/User Manual Source/JIRA Quick Start Guide.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..02329fe5b8baf19006d2faced11fe65a1605f3e8
Binary files /dev/null and b/User Manual Source/JIRA Quick Start Guide.pdf differ
diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index b77fb373196678557c01adb1a6afd276b64b77fb..a3d5ec7295f232bcd61fa682de69dc8b53009e12 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -32,630 +32,559 @@ Partial Class F_ENG
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_ENG))
-        Me.TbNleerl = New System.Windows.Forms.TextBox()
-        Me.Label11 = New System.Windows.Forms.Label()
-        Me.TbInertia = New System.Windows.Forms.TextBox()
-        Me.Label41 = New System.Windows.Forms.Label()
-        Me.Label40 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.ButCancel = New System.Windows.Forms.Button()
-        Me.ButOK = New System.Windows.Forms.Button()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.TbDispl = New System.Windows.Forms.TextBox()
-        Me.TbName = New System.Windows.Forms.TextBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.TbMAP = New System.Windows.Forms.TextBox()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.BtMAP = New System.Windows.Forms.Button()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.BtMAPopen = New System.Windows.Forms.Button()
-        Me.BtAddFLD = New System.Windows.Forms.Button()
-        Me.BtRemFLD = New System.Windows.Forms.Button()
-        Me.LvFLDs = New System.Windows.Forms.ListView()
-        Me.ColumnHeader0 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.Label32 = New System.Windows.Forms.Label()
-        Me.PnInertia = New System.Windows.Forms.Panel()
-        Me.GrWHTC = New System.Windows.Forms.GroupBox()
-        Me.Label13 = New System.Windows.Forms.Label()
-        Me.TbWHTCmw = New System.Windows.Forms.TextBox()
-        Me.TbWHTCrural = New System.Windows.Forms.TextBox()
-        Me.TbWHTCurban = New System.Windows.Forms.TextBox()
-        Me.Label8 = New System.Windows.Forms.Label()
-        Me.Label12 = New System.Windows.Forms.Label()
-        Me.Label10 = New System.Windows.Forms.Label()
-        Me.Label9 = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.PicBox = New System.Windows.Forms.PictureBox()
-        Me.ToolStrip1.SuspendLayout()
-        Me.StatusStrip1.SuspendLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.CmOpenFile.SuspendLayout()
-        Me.GroupBox1.SuspendLayout()
-        Me.PnInertia.SuspendLayout()
-        Me.GrWHTC.SuspendLayout()
-        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'TbNleerl
-        '
-        Me.TbNleerl.Location = New System.Drawing.Point(123, 108)
-        Me.TbNleerl.Name = "TbNleerl"
-        Me.TbNleerl.Size = New System.Drawing.Size(57, 20)
-        Me.TbNleerl.TabIndex = 1
-        '
-        'Label11
-        '
-        Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(15, 111)
-        Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(102, 13)
-        Me.Label11.TabIndex = 15
-        Me.Label11.Text = "Idling Engine Speed"
-        '
-        'TbInertia
-        '
-        Me.TbInertia.Location = New System.Drawing.Point(120, 2)
-        Me.TbInertia.Name = "TbInertia"
-        Me.TbInertia.Size = New System.Drawing.Size(57, 20)
-        Me.TbInertia.TabIndex = 3
-        '
-        'Label41
-        '
-        Me.Label41.AutoSize = True
-        Me.Label41.Location = New System.Drawing.Point(183, 5)
-        Me.Label41.Name = "Label41"
-        Me.Label41.Size = New System.Drawing.Size(36, 13)
-        Me.Label41.TabIndex = 24
-        Me.Label41.Text = "[kgm²]"
-        '
-        'Label40
-        '
-        Me.Label40.AutoSize = True
-        Me.Label40.Location = New System.Drawing.Point(186, 111)
-        Me.Label40.Name = "Label40"
-        Me.Label40.Size = New System.Drawing.Size(30, 13)
-        Me.Label40.TabIndex = 24
-        Me.Label40.Text = "[rpm]"
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(12, 5)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(102, 13)
-        Me.Label5.TabIndex = 0
-        Me.Label5.Text = "Inertia incl. Flywheel"
-        '
-        'ButCancel
-        '
-        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.ButCancel.Location = New System.Drawing.Point(898, 469)
-        Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 13
-        Me.ButCancel.Text = "Cancel"
-        Me.ButCancel.UseVisualStyleBackColor = True
-        '
-        'ButOK
-        '
-        Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButOK.Location = New System.Drawing.Point(817, 469)
-        Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 12
-        Me.ButOK.Text = "Save"
-        Me.ButOK.UseVisualStyleBackColor = True
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(985, 25)
-        Me.ToolStrip1.TabIndex = 30
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripBtNew
-        '
-        Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
-        Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtNew.Text = "ToolStripButton1"
-        Me.ToolStripBtNew.ToolTipText = "New"
-        '
-        'ToolStripBtOpen
-        '
-        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
-        Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtOpen.Text = "ToolStripButton1"
-        Me.ToolStripBtOpen.ToolTipText = "Open..."
-        '
-        'ToolStripBtSave
-        '
-        Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
-        Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSave.Text = "ToolStripButton1"
-        Me.ToolStripBtSave.ToolTipText = "Save"
-        '
-        'ToolStripBtSaveAs
-        '
-        Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
-        Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
-        Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-        '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripBtSendTo
-        '
-        Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
-        Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSendTo.Text = "Send to Job Editor"
-        Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton1.Text = "Help"
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 495)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(985, 22)
-        Me.StatusStrip1.SizingGrip = False
-        Me.StatusStrip1.TabIndex = 37
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'LbStatus
-        '
-        Me.LbStatus.Name = "LbStatus"
-        Me.LbStatus.Size = New System.Drawing.Size(39, 17)
-        Me.LbStatus.Text = "Status"
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(186, 137)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(33, 13)
-        Me.Label1.TabIndex = 24
-        Me.Label1.Text = "[ccm]"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(46, 137)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(71, 13)
-        Me.Label2.TabIndex = 13
-        Me.Label2.Text = "Displacement"
-        '
-        'TbDispl
-        '
-        Me.TbDispl.Location = New System.Drawing.Point(123, 134)
-        Me.TbDispl.Name = "TbDispl"
-        Me.TbDispl.Size = New System.Drawing.Size(57, 20)
-        Me.TbDispl.TabIndex = 2
-        '
-        'TbName
-        '
-        Me.TbName.Location = New System.Drawing.Point(123, 82)
-        Me.TbName.Name = "TbName"
-        Me.TbName.Size = New System.Drawing.Size(370, 20)
-        Me.TbName.TabIndex = 0
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(30, 85)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(87, 13)
-        Me.Label3.TabIndex = 11
-        Me.Label3.Text = "Make and Model"
-        '
-        'TbMAP
-        '
-        Me.TbMAP.Location = New System.Drawing.Point(12, 351)
-        Me.TbMAP.Name = "TbMAP"
-        Me.TbMAP.Size = New System.Drawing.Size(418, 20)
-        Me.TbMAP.TabIndex = 5
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(12, 335)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(115, 13)
-        Me.Label6.TabIndex = 38
-        Me.Label6.Text = "Fuel Consumption Map"
-        '
-        'BtMAP
-        '
-        Me.BtMAP.Location = New System.Drawing.Point(436, 349)
-        Me.BtMAP.Name = "BtMAP"
-        Me.BtMAP.Size = New System.Drawing.Size(28, 23)
-        Me.BtMAP.TabIndex = 6
-        Me.BtMAP.TabStop = False
-        Me.BtMAP.Text = "..."
-        Me.BtMAP.UseVisualStyleBackColor = True
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.BackColor = System.Drawing.Color.White
-        Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_ENG
-        Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(481, 40)
-        Me.PictureBox1.TabIndex = 39
-        Me.PictureBox1.TabStop = False
-        '
-        'CmOpenFile
-        '
-        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-        Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
-        '
-        'OpenWithToolStripMenuItem
-        '
-        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-        '
-        'ShowInFolderToolStripMenuItem
-        '
-        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-        '
-        'BtMAPopen
-        '
-        Me.BtMAPopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtMAPopen.Location = New System.Drawing.Point(470, 349)
-        Me.BtMAPopen.Name = "BtMAPopen"
-        Me.BtMAPopen.Size = New System.Drawing.Size(23, 23)
-        Me.BtMAPopen.TabIndex = 7
-        Me.BtMAPopen.TabStop = False
-        Me.BtMAPopen.UseVisualStyleBackColor = True
-        '
-        'BtAddFLD
-        '
-        Me.BtAddFLD.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.BtAddFLD.Location = New System.Drawing.Point(6, 133)
-        Me.BtAddFLD.Name = "BtAddFLD"
-        Me.BtAddFLD.Size = New System.Drawing.Size(29, 23)
-        Me.BtAddFLD.TabIndex = 1
-        Me.BtAddFLD.UseVisualStyleBackColor = True
-        '
-        'BtRemFLD
-        '
-        Me.BtRemFLD.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.BtRemFLD.Location = New System.Drawing.Point(43, 133)
-        Me.BtRemFLD.Name = "BtRemFLD"
-        Me.BtRemFLD.Size = New System.Drawing.Size(29, 23)
-        Me.BtRemFLD.TabIndex = 2
-        Me.BtRemFLD.UseVisualStyleBackColor = True
-        '
-        'LvFLDs
-        '
-        Me.LvFLDs.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader0, Me.ColumnHeader1})
-        Me.LvFLDs.FullRowSelect = True
-        Me.LvFLDs.GridLines = True
-        Me.LvFLDs.HideSelection = False
-        Me.LvFLDs.Location = New System.Drawing.Point(6, 19)
-        Me.LvFLDs.MultiSelect = False
-        Me.LvFLDs.Name = "LvFLDs"
-        Me.LvFLDs.Size = New System.Drawing.Size(469, 108)
-        Me.LvFLDs.TabIndex = 0
-        Me.LvFLDs.TabStop = False
-        Me.LvFLDs.UseCompatibleStateImageBehavior = False
-        Me.LvFLDs.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader0
-        '
-        Me.ColumnHeader0.Text = "File"
-        Me.ColumnHeader0.Width = 365
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "Assigned Gears"
-        Me.ColumnHeader1.Width = 92
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.Label32)
-        Me.GroupBox1.Controls.Add(Me.LvFLDs)
-        Me.GroupBox1.Controls.Add(Me.BtRemFLD)
-        Me.GroupBox1.Controls.Add(Me.BtAddFLD)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 160)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(481, 162)
-        Me.GroupBox1.TabIndex = 4
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Full Load and Drag Curves"
-        '
-        'Label32
-        '
-        Me.Label32.AutoSize = True
-        Me.Label32.Location = New System.Drawing.Point(354, 138)
-        Me.Label32.Name = "Label32"
-        Me.Label32.Size = New System.Drawing.Size(121, 13)
-        Me.Label32.TabIndex = 44
-        Me.Label32.Text = "Double-Click to edit item"
-        '
-        'PnInertia
-        '
-        Me.PnInertia.Controls.Add(Me.Label5)
-        Me.PnInertia.Controls.Add(Me.Label41)
-        Me.PnInertia.Controls.Add(Me.TbInertia)
-        Me.PnInertia.Location = New System.Drawing.Point(264, 106)
-        Me.PnInertia.Name = "PnInertia"
-        Me.PnInertia.Size = New System.Drawing.Size(229, 32)
-        Me.PnInertia.TabIndex = 3
-        '
-        'GrWHTC
-        '
-        Me.GrWHTC.Controls.Add(Me.Label13)
-        Me.GrWHTC.Controls.Add(Me.TbWHTCmw)
-        Me.GrWHTC.Controls.Add(Me.TbWHTCrural)
-        Me.GrWHTC.Controls.Add(Me.TbWHTCurban)
-        Me.GrWHTC.Controls.Add(Me.Label8)
-        Me.GrWHTC.Controls.Add(Me.Label12)
-        Me.GrWHTC.Controls.Add(Me.Label10)
-        Me.GrWHTC.Controls.Add(Me.Label9)
-        Me.GrWHTC.Controls.Add(Me.Label7)
-        Me.GrWHTC.Controls.Add(Me.Label4)
-        Me.GrWHTC.Enabled = False
-        Me.GrWHTC.Location = New System.Drawing.Point(12, 392)
-        Me.GrWHTC.Name = "GrWHTC"
-        Me.GrWHTC.Size = New System.Drawing.Size(481, 91)
-        Me.GrWHTC.TabIndex = 9
-        Me.GrWHTC.TabStop = False
-        Me.GrWHTC.Text = "WHTC Test Results"
-        '
-        'Label13
-        '
-        Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(6, 27)
-        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(91, 13)
-        Me.Label13.TabIndex = 3
-        Me.Label13.Text = "Fuel Consumption"
-        '
-        'TbWHTCmw
-        '
-        Me.TbWHTCmw.Location = New System.Drawing.Point(348, 56)
-        Me.TbWHTCmw.Name = "TbWHTCmw"
-        Me.TbWHTCmw.Size = New System.Drawing.Size(57, 20)
-        Me.TbWHTCmw.TabIndex = 2
-        '
-        'TbWHTCrural
-        '
-        Me.TbWHTCrural.Location = New System.Drawing.Point(192, 56)
-        Me.TbWHTCrural.Name = "TbWHTCrural"
-        Me.TbWHTCrural.Size = New System.Drawing.Size(57, 20)
-        Me.TbWHTCrural.TabIndex = 1
-        '
-        'TbWHTCurban
-        '
-        Me.TbWHTCurban.Location = New System.Drawing.Point(36, 56)
-        Me.TbWHTCurban.Name = "TbWHTCurban"
-        Me.TbWHTCurban.Size = New System.Drawing.Size(57, 20)
-        Me.TbWHTCurban.TabIndex = 0
-        '
-        'Label8
-        '
-        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(317, 59)
-        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(25, 13)
-        Me.Label8.TabIndex = 0
-        Me.Label8.Text = "Mot"
-        '
-        'Label12
-        '
-        Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(411, 59)
-        Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(47, 13)
-        Me.Label12.TabIndex = 0
-        Me.Label12.Text = "[g/kWh]"
-        '
-        'Label10
-        '
-        Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(255, 59)
-        Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(47, 13)
-        Me.Label10.TabIndex = 0
-        Me.Label10.Text = "[g/kWh]"
-        '
-        'Label9
-        '
-        Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(99, 59)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(47, 13)
-        Me.Label9.TabIndex = 0
-        Me.Label9.Text = "[g/kWh]"
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(162, 59)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(24, 13)
-        Me.Label7.TabIndex = 0
-        Me.Label7.Text = "Rur"
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(6, 59)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(24, 13)
-        Me.Label4.TabIndex = 0
-        Me.Label4.Text = "Urb"
-        '
-        'PicBox
-        '
-        Me.PicBox.BackColor = System.Drawing.Color.LightGray
-        Me.PicBox.Location = New System.Drawing.Point(499, 28)
-        Me.PicBox.Name = "PicBox"
-        Me.PicBox.Size = New System.Drawing.Size(474, 425)
-        Me.PicBox.TabIndex = 40
-        Me.PicBox.TabStop = False
-        '
-        'F_ENG
-        '
-        Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(985, 517)
-        Me.Controls.Add(Me.PicBox)
-        Me.Controls.Add(Me.GrWHTC)
-        Me.Controls.Add(Me.PnInertia)
-        Me.Controls.Add(Me.GroupBox1)
-        Me.Controls.Add(Me.BtMAPopen)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.BtMAP)
-        Me.Controls.Add(Me.Label6)
-        Me.Controls.Add(Me.TbNleerl)
-        Me.Controls.Add(Me.StatusStrip1)
-        Me.Controls.Add(Me.Label11)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.TbDispl)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.ButCancel)
-        Me.Controls.Add(Me.ButOK)
-        Me.Controls.Add(Me.TbMAP)
-        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.Label40)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.TbName)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
-        Me.Name = "F_ENG"
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "F_ENG"
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.CmOpenFile.ResumeLayout(False)
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
-        Me.PnInertia.ResumeLayout(False)
-        Me.PnInertia.PerformLayout()
-        Me.GrWHTC.ResumeLayout(False)
-        Me.GrWHTC.PerformLayout()
-        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+		Me.components = New System.ComponentModel.Container()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_ENG))
+		Me.TbNleerl = New System.Windows.Forms.TextBox()
+		Me.Label11 = New System.Windows.Forms.Label()
+		Me.TbInertia = New System.Windows.Forms.TextBox()
+		Me.Label41 = New System.Windows.Forms.Label()
+		Me.Label40 = New System.Windows.Forms.Label()
+		Me.Label5 = New System.Windows.Forms.Label()
+		Me.ButCancel = New System.Windows.Forms.Button()
+		Me.ButOK = New System.Windows.Forms.Button()
+		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+		Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.TbDispl = New System.Windows.Forms.TextBox()
+		Me.TbName = New System.Windows.Forms.TextBox()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.TbMAP = New System.Windows.Forms.TextBox()
+		Me.Label6 = New System.Windows.Forms.Label()
+		Me.BtMAP = New System.Windows.Forms.Button()
+		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.BtMAPopen = New System.Windows.Forms.Button()
+		Me.PnInertia = New System.Windows.Forms.Panel()
+		Me.GrWHTC = New System.Windows.Forms.GroupBox()
+		Me.Label13 = New System.Windows.Forms.Label()
+		Me.TbWHTCmw = New System.Windows.Forms.TextBox()
+		Me.TbWHTCrural = New System.Windows.Forms.TextBox()
+		Me.TbWHTCurban = New System.Windows.Forms.TextBox()
+		Me.Label8 = New System.Windows.Forms.Label()
+		Me.Label7 = New System.Windows.Forms.Label()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.PicBox = New System.Windows.Forms.PictureBox()
+		Me.TbFLD = New System.Windows.Forms.TextBox()
+		Me.Label14 = New System.Windows.Forms.Label()
+		Me.BtFLD = New System.Windows.Forms.Button()
+		Me.BtFLDopen = New System.Windows.Forms.Button()
+		Me.ToolStrip1.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.CmOpenFile.SuspendLayout()
+		Me.PnInertia.SuspendLayout()
+		Me.GrWHTC.SuspendLayout()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.SuspendLayout()
+		'
+		'TbNleerl
+		'
+		Me.TbNleerl.Location = New System.Drawing.Point(123, 108)
+		Me.TbNleerl.Name = "TbNleerl"
+		Me.TbNleerl.Size = New System.Drawing.Size(57, 20)
+		Me.TbNleerl.TabIndex = 1
+		'
+		'Label11
+		'
+		Me.Label11.AutoSize = True
+		Me.Label11.Location = New System.Drawing.Point(15, 111)
+		Me.Label11.Name = "Label11"
+		Me.Label11.Size = New System.Drawing.Size(102, 13)
+		Me.Label11.TabIndex = 15
+		Me.Label11.Text = "Idling Engine Speed"
+		'
+		'TbInertia
+		'
+		Me.TbInertia.Location = New System.Drawing.Point(120, 2)
+		Me.TbInertia.Name = "TbInertia"
+		Me.TbInertia.Size = New System.Drawing.Size(57, 20)
+		Me.TbInertia.TabIndex = 3
+		'
+		'Label41
+		'
+		Me.Label41.AutoSize = True
+		Me.Label41.Location = New System.Drawing.Point(183, 5)
+		Me.Label41.Name = "Label41"
+		Me.Label41.Size = New System.Drawing.Size(36, 13)
+		Me.Label41.TabIndex = 24
+		Me.Label41.Text = "[kgm²]"
+		'
+		'Label40
+		'
+		Me.Label40.AutoSize = True
+		Me.Label40.Location = New System.Drawing.Point(186, 111)
+		Me.Label40.Name = "Label40"
+		Me.Label40.Size = New System.Drawing.Size(30, 13)
+		Me.Label40.TabIndex = 24
+		Me.Label40.Text = "[rpm]"
+		'
+		'Label5
+		'
+		Me.Label5.AutoSize = True
+		Me.Label5.Location = New System.Drawing.Point(12, 5)
+		Me.Label5.Name = "Label5"
+		Me.Label5.Size = New System.Drawing.Size(102, 13)
+		Me.Label5.TabIndex = 0
+		Me.Label5.Text = "Inertia incl. Flywheel"
+		'
+		'ButCancel
+		'
+		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.ButCancel.Location = New System.Drawing.Point(898, 469)
+		Me.ButCancel.Name = "ButCancel"
+		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+		Me.ButCancel.TabIndex = 13
+		Me.ButCancel.Text = "Cancel"
+		Me.ButCancel.UseVisualStyleBackColor = True
+		'
+		'ButOK
+		'
+		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButOK.Location = New System.Drawing.Point(817, 469)
+		Me.ButOK.Name = "ButOK"
+		Me.ButOK.Size = New System.Drawing.Size(75, 23)
+		Me.ButOK.TabIndex = 12
+		Me.ButOK.Text = "Save"
+		Me.ButOK.UseVisualStyleBackColor = True
+		'
+		'ToolStrip1
+		'
+		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+		Me.ToolStrip1.Name = "ToolStrip1"
+		Me.ToolStrip1.Size = New System.Drawing.Size(985, 25)
+		Me.ToolStrip1.TabIndex = 30
+		Me.ToolStrip1.Text = "ToolStrip1"
+		'
+		'ToolStripBtNew
+		'
+		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
+		Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtNew.Name = "ToolStripBtNew"
+		Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtNew.Text = "ToolStripButton1"
+		Me.ToolStripBtNew.ToolTipText = "New"
+		'
+		'ToolStripBtOpen
+		'
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtOpen.Text = "ToolStripButton1"
+		Me.ToolStripBtOpen.ToolTipText = "Open..."
+		'
+		'ToolStripBtSave
+		'
+		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
+		Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSave.Name = "ToolStripBtSave"
+		Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSave.Text = "ToolStripButton1"
+		Me.ToolStripBtSave.ToolTipText = "Save"
+		'
+		'ToolStripBtSaveAs
+		'
+		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+		Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+		Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+		'
+		'ToolStripSeparator3
+		'
+		Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+		Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripBtSendTo
+		'
+		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
+		Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+		Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSendTo.Text = "Send to Job Editor"
+		Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
+		'
+		'ToolStripSeparator1
+		'
+		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripButton1
+		'
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton1.Name = "ToolStripButton1"
+		Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripButton1.Text = "Help"
+		'
+		'StatusStrip1
+		'
+		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 495)
+		Me.StatusStrip1.Name = "StatusStrip1"
+		Me.StatusStrip1.Size = New System.Drawing.Size(985, 22)
+		Me.StatusStrip1.SizingGrip = False
+		Me.StatusStrip1.TabIndex = 37
+		Me.StatusStrip1.Text = "StatusStrip1"
+		'
+		'LbStatus
+		'
+		Me.LbStatus.Name = "LbStatus"
+		Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+		Me.LbStatus.Text = "Status"
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(186, 137)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(33, 13)
+		Me.Label1.TabIndex = 24
+		Me.Label1.Text = "[ccm]"
+		'
+		'Label2
+		'
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(46, 137)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(71, 13)
+		Me.Label2.TabIndex = 13
+		Me.Label2.Text = "Displacement"
+		'
+		'TbDispl
+		'
+		Me.TbDispl.Location = New System.Drawing.Point(123, 134)
+		Me.TbDispl.Name = "TbDispl"
+		Me.TbDispl.Size = New System.Drawing.Size(57, 20)
+		Me.TbDispl.TabIndex = 2
+		'
+		'TbName
+		'
+		Me.TbName.Location = New System.Drawing.Point(123, 82)
+		Me.TbName.Name = "TbName"
+		Me.TbName.Size = New System.Drawing.Size(370, 20)
+		Me.TbName.TabIndex = 0
+		'
+		'Label3
+		'
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(30, 85)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(87, 13)
+		Me.Label3.TabIndex = 11
+		Me.Label3.Text = "Make and Model"
+		'
+		'TbMAP
+		'
+		Me.TbMAP.Location = New System.Drawing.Point(12, 259)
+		Me.TbMAP.Name = "TbMAP"
+		Me.TbMAP.Size = New System.Drawing.Size(418, 20)
+		Me.TbMAP.TabIndex = 5
+		'
+		'Label6
+		'
+		Me.Label6.AutoSize = True
+		Me.Label6.Location = New System.Drawing.Point(12, 243)
+		Me.Label6.Name = "Label6"
+		Me.Label6.Size = New System.Drawing.Size(115, 13)
+		Me.Label6.TabIndex = 38
+		Me.Label6.Text = "Fuel Consumption Map"
+		'
+		'BtMAP
+		'
+		Me.BtMAP.Location = New System.Drawing.Point(436, 257)
+		Me.BtMAP.Name = "BtMAP"
+		Me.BtMAP.Size = New System.Drawing.Size(28, 23)
+		Me.BtMAP.TabIndex = 6
+		Me.BtMAP.TabStop = False
+		Me.BtMAP.Text = "..."
+		Me.BtMAP.UseVisualStyleBackColor = True
+		'
+		'PictureBox1
+		'
+		Me.PictureBox1.BackColor = System.Drawing.Color.White
+		Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_ENG
+		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
+		Me.PictureBox1.Name = "PictureBox1"
+		Me.PictureBox1.Size = New System.Drawing.Size(481, 40)
+		Me.PictureBox1.TabIndex = 39
+		Me.PictureBox1.TabStop = False
+		'
+		'CmOpenFile
+		'
+		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+		Me.CmOpenFile.Name = "CmOpenFile"
+		Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+		'
+		'OpenWithToolStripMenuItem
+		'
+		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+		'
+		'ShowInFolderToolStripMenuItem
+		'
+		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+		'
+		'BtMAPopen
+		'
+		Me.BtMAPopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+		Me.BtMAPopen.Location = New System.Drawing.Point(470, 257)
+		Me.BtMAPopen.Name = "BtMAPopen"
+		Me.BtMAPopen.Size = New System.Drawing.Size(23, 23)
+		Me.BtMAPopen.TabIndex = 7
+		Me.BtMAPopen.TabStop = False
+		Me.BtMAPopen.UseVisualStyleBackColor = True
+		'
+		'PnInertia
+		'
+		Me.PnInertia.Controls.Add(Me.Label5)
+		Me.PnInertia.Controls.Add(Me.Label41)
+		Me.PnInertia.Controls.Add(Me.TbInertia)
+		Me.PnInertia.Location = New System.Drawing.Point(264, 106)
+		Me.PnInertia.Name = "PnInertia"
+		Me.PnInertia.Size = New System.Drawing.Size(229, 32)
+		Me.PnInertia.TabIndex = 3
+		'
+		'GrWHTC
+		'
+		Me.GrWHTC.Controls.Add(Me.Label13)
+		Me.GrWHTC.Controls.Add(Me.TbWHTCmw)
+		Me.GrWHTC.Controls.Add(Me.TbWHTCrural)
+		Me.GrWHTC.Controls.Add(Me.TbWHTCurban)
+		Me.GrWHTC.Controls.Add(Me.Label8)
+		Me.GrWHTC.Controls.Add(Me.Label7)
+		Me.GrWHTC.Controls.Add(Me.Label4)
+		Me.GrWHTC.Enabled = False
+		Me.GrWHTC.Location = New System.Drawing.Point(12, 300)
+		Me.GrWHTC.Name = "GrWHTC"
+		Me.GrWHTC.Size = New System.Drawing.Size(481, 91)
+		Me.GrWHTC.TabIndex = 9
+		Me.GrWHTC.TabStop = False
+		Me.GrWHTC.Text = "WHTC Correction"
+		'
+		'Label13
+		'
+		Me.Label13.AutoSize = True
+		Me.Label13.Location = New System.Drawing.Point(6, 27)
+		Me.Label13.Name = "Label13"
+		Me.Label13.Size = New System.Drawing.Size(242, 13)
+		Me.Label13.TabIndex = 3
+		Me.Label13.Text = "Correction Factors calculated with VECTO-Engine"
+		'
+		'TbWHTCmw
+		'
+		Me.TbWHTCmw.Location = New System.Drawing.Point(348, 56)
+		Me.TbWHTCmw.Name = "TbWHTCmw"
+		Me.TbWHTCmw.Size = New System.Drawing.Size(57, 20)
+		Me.TbWHTCmw.TabIndex = 2
+		'
+		'TbWHTCrural
+		'
+		Me.TbWHTCrural.Location = New System.Drawing.Point(192, 56)
+		Me.TbWHTCrural.Name = "TbWHTCrural"
+		Me.TbWHTCrural.Size = New System.Drawing.Size(57, 20)
+		Me.TbWHTCrural.TabIndex = 1
+		'
+		'TbWHTCurban
+		'
+		Me.TbWHTCurban.Location = New System.Drawing.Point(48, 56)
+		Me.TbWHTCurban.Name = "TbWHTCurban"
+		Me.TbWHTCurban.Size = New System.Drawing.Size(57, 20)
+		Me.TbWHTCurban.TabIndex = 0
+		'
+		'Label8
+		'
+		Me.Label8.AutoSize = True
+		Me.Label8.Location = New System.Drawing.Point(289, 59)
+		Me.Label8.Name = "Label8"
+		Me.Label8.Size = New System.Drawing.Size(53, 13)
+		Me.Label8.TabIndex = 0
+		Me.Label8.Text = "Motorway"
+		'
+		'Label7
+		'
+		Me.Label7.AutoSize = True
+		Me.Label7.Location = New System.Drawing.Point(154, 59)
+		Me.Label7.Name = "Label7"
+		Me.Label7.Size = New System.Drawing.Size(32, 13)
+		Me.Label7.TabIndex = 0
+		Me.Label7.Text = "Rural"
+		'
+		'Label4
+		'
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(6, 59)
+		Me.Label4.Name = "Label4"
+		Me.Label4.Size = New System.Drawing.Size(36, 13)
+		Me.Label4.TabIndex = 0
+		Me.Label4.Text = "Urban"
+		'
+		'PicBox
+		'
+		Me.PicBox.BackColor = System.Drawing.Color.LightGray
+		Me.PicBox.Location = New System.Drawing.Point(499, 28)
+		Me.PicBox.Name = "PicBox"
+		Me.PicBox.Size = New System.Drawing.Size(474, 425)
+		Me.PicBox.TabIndex = 40
+		Me.PicBox.TabStop = False
+		'
+		'TbFLD
+		'
+		Me.TbFLD.Location = New System.Drawing.Point(12, 202)
+		Me.TbFLD.Name = "TbFLD"
+		Me.TbFLD.Size = New System.Drawing.Size(418, 20)
+		Me.TbFLD.TabIndex = 5
+		'
+		'Label14
+		'
+		Me.Label14.AutoSize = True
+		Me.Label14.Location = New System.Drawing.Point(12, 186)
+		Me.Label14.Name = "Label14"
+		Me.Label14.Size = New System.Drawing.Size(128, 13)
+		Me.Label14.TabIndex = 38
+		Me.Label14.Text = "Full Load and Drag Curve"
+		'
+		'BtFLD
+		'
+		Me.BtFLD.Location = New System.Drawing.Point(436, 200)
+		Me.BtFLD.Name = "BtFLD"
+		Me.BtFLD.Size = New System.Drawing.Size(28, 23)
+		Me.BtFLD.TabIndex = 6
+		Me.BtFLD.TabStop = False
+		Me.BtFLD.Text = "..."
+		Me.BtFLD.UseVisualStyleBackColor = True
+		'
+		'BtFLDopen
+		'
+		Me.BtFLDopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+		Me.BtFLDopen.Location = New System.Drawing.Point(470, 200)
+		Me.BtFLDopen.Name = "BtFLDopen"
+		Me.BtFLDopen.Size = New System.Drawing.Size(23, 23)
+		Me.BtFLDopen.TabIndex = 7
+		Me.BtFLDopen.TabStop = False
+		Me.BtFLDopen.UseVisualStyleBackColor = True
+		'
+		'F_ENG
+		'
+		Me.AcceptButton = Me.ButOK
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.ButCancel
+		Me.ClientSize = New System.Drawing.Size(985, 517)
+		Me.Controls.Add(Me.PicBox)
+		Me.Controls.Add(Me.GrWHTC)
+		Me.Controls.Add(Me.PnInertia)
+		Me.Controls.Add(Me.BtFLDopen)
+		Me.Controls.Add(Me.BtMAPopen)
+		Me.Controls.Add(Me.PictureBox1)
+		Me.Controls.Add(Me.BtFLD)
+		Me.Controls.Add(Me.BtMAP)
+		Me.Controls.Add(Me.Label14)
+		Me.Controls.Add(Me.Label6)
+		Me.Controls.Add(Me.TbNleerl)
+		Me.Controls.Add(Me.StatusStrip1)
+		Me.Controls.Add(Me.Label11)
+		Me.Controls.Add(Me.ToolStrip1)
+		Me.Controls.Add(Me.TbDispl)
+		Me.Controls.Add(Me.Label2)
+		Me.Controls.Add(Me.ButCancel)
+		Me.Controls.Add(Me.TbFLD)
+		Me.Controls.Add(Me.ButOK)
+		Me.Controls.Add(Me.TbMAP)
+		Me.Controls.Add(Me.Label3)
+		Me.Controls.Add(Me.Label40)
+		Me.Controls.Add(Me.Label1)
+		Me.Controls.Add(Me.TbName)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MaximizeBox = False
+		Me.Name = "F_ENG"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "F_ENG"
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.CmOpenFile.ResumeLayout(False)
+		Me.PnInertia.ResumeLayout(False)
+		Me.PnInertia.PerformLayout()
+		Me.GrWHTC.ResumeLayout(False)
+		Me.GrWHTC.PerformLayout()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-    End Sub
-    Friend WithEvents TbNleerl As System.Windows.Forms.TextBox
-    Friend WithEvents Label11 As System.Windows.Forms.Label
-    Friend WithEvents TbInertia As System.Windows.Forms.TextBox
-    Friend WithEvents Label41 As System.Windows.Forms.Label
-    Friend WithEvents Label40 As System.Windows.Forms.Label
-    Friend WithEvents Label5 As System.Windows.Forms.Label
-    Friend WithEvents ButCancel As System.Windows.Forms.Button
-    Friend WithEvents ButOK As System.Windows.Forms.Button
-    Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
-    Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
-    Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
-    Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents TbDispl As System.Windows.Forms.TextBox
-    Friend WithEvents TbName As System.Windows.Forms.TextBox
-    Friend WithEvents Label3 As System.Windows.Forms.Label
-    Friend WithEvents TbMAP As System.Windows.Forms.TextBox
-    Friend WithEvents Label6 As System.Windows.Forms.Label
-    Friend WithEvents BtMAP As System.Windows.Forms.Button
-    Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
-    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents BtMAPopen As System.Windows.Forms.Button
-    Friend WithEvents BtAddFLD As System.Windows.Forms.Button
-    Friend WithEvents BtRemFLD As System.Windows.Forms.Button
-    Friend WithEvents LvFLDs As System.Windows.Forms.ListView
-    Friend WithEvents ColumnHeader0 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-    Friend WithEvents Label32 As System.Windows.Forms.Label
-    Friend WithEvents PnInertia As System.Windows.Forms.Panel
-    Friend WithEvents GrWHTC As System.Windows.Forms.GroupBox
-    Friend WithEvents TbWHTCmw As System.Windows.Forms.TextBox
-    Friend WithEvents TbWHTCrural As System.Windows.Forms.TextBox
-    Friend WithEvents TbWHTCurban As System.Windows.Forms.TextBox
-    Friend WithEvents Label8 As System.Windows.Forms.Label
-    Friend WithEvents Label12 As System.Windows.Forms.Label
-    Friend WithEvents Label10 As System.Windows.Forms.Label
-    Friend WithEvents Label9 As System.Windows.Forms.Label
-    Friend WithEvents Label7 As System.Windows.Forms.Label
-    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents PicBox As System.Windows.Forms.PictureBox
-    Friend WithEvents Label13 As System.Windows.Forms.Label
+	End Sub
+	Friend WithEvents TbNleerl As System.Windows.Forms.TextBox
+	Friend WithEvents Label11 As System.Windows.Forms.Label
+	Friend WithEvents TbInertia As System.Windows.Forms.TextBox
+	Friend WithEvents Label41 As System.Windows.Forms.Label
+	Friend WithEvents Label40 As System.Windows.Forms.Label
+	Friend WithEvents Label5 As System.Windows.Forms.Label
+	Friend WithEvents ButCancel As System.Windows.Forms.Button
+	Friend WithEvents ButOK As System.Windows.Forms.Button
+	Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+	Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
+	Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
+	Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
+	Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
+	Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents Label2 As System.Windows.Forms.Label
+	Friend WithEvents TbDispl As System.Windows.Forms.TextBox
+	Friend WithEvents TbName As System.Windows.Forms.TextBox
+	Friend WithEvents Label3 As System.Windows.Forms.Label
+	Friend WithEvents TbMAP As System.Windows.Forms.TextBox
+	Friend WithEvents Label6 As System.Windows.Forms.Label
+	Friend WithEvents BtMAP As System.Windows.Forms.Button
+	Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+	Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
+	Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+	Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+	Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+	Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+	Friend WithEvents BtMAPopen As System.Windows.Forms.Button
+	Friend WithEvents PnInertia As System.Windows.Forms.Panel
+	Friend WithEvents GrWHTC As System.Windows.Forms.GroupBox
+	Friend WithEvents TbWHTCmw As System.Windows.Forms.TextBox
+	Friend WithEvents TbWHTCrural As System.Windows.Forms.TextBox
+	Friend WithEvents TbWHTCurban As System.Windows.Forms.TextBox
+	Friend WithEvents Label8 As System.Windows.Forms.Label
+	Friend WithEvents Label7 As System.Windows.Forms.Label
+	Friend WithEvents Label4 As System.Windows.Forms.Label
+	Friend WithEvents PicBox As System.Windows.Forms.PictureBox
+	Friend WithEvents Label13 As System.Windows.Forms.Label
+	Friend WithEvents TbFLD As System.Windows.Forms.TextBox
+	Friend WithEvents Label14 As System.Windows.Forms.Label
+	Friend WithEvents BtFLD As System.Windows.Forms.Button
+	Friend WithEvents BtFLDopen As System.Windows.Forms.Button
 End Class
diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb
index 1a0d85e8c4da047be54710e04d9b0e5253b39e42..b7017cee13b7a7f44346686333112b0502b64494 100644
--- a/VECTO/GUI/F_ENG.vb
+++ b/VECTO/GUI/F_ENG.vb
@@ -19,7 +19,6 @@ Public Class F_ENG
     Public AutoSendTo As Boolean = False
     Public JobDir As String = ""
     Private Changed As Boolean = False
-    Private FLDdia As F_FLD
 
 
     'Before closing Editor: Check if file was changed and ask to save.
@@ -32,9 +31,7 @@ Public Class F_ENG
     'Initialise.
     Private Sub F_ENG_Load(sender As Object, e As System.EventArgs) Handles Me.Load
 
-        FLDdia = New F_FLD
-
-        Me.PnInertia.Enabled = Not Cfg.DeclMode
+		Me.PnInertia.Enabled = Not Cfg.DeclMode
         Me.GrWHTC.Enabled = Cfg.DeclMode
 
 
@@ -112,8 +109,8 @@ Public Class F_ENG
         Me.TbDispl.Text = ""
         Me.TbInertia.Text = ""
         Me.TbNleerl.Text = ""
-        Me.LvFLDs.Items.Clear()
-        Me.TbMAP.Text = ""
+		Me.TbMAP.Text = ""
+		Me.TbFLD.Text = ""
         Me.TbWHTCurban.Text = ""
         Me.TbWHTCrural.Text = ""
         Me.TbWHTCmw.Text = ""
@@ -135,8 +132,6 @@ Public Class F_ENG
     'Open VENG file
     Public Sub openENG(ByVal file As String)
         Dim ENG0 As cENG
-        Dim i As Integer
-        Dim lv0 As ListViewItem
 
         If ChangeCheckCancel() Then Exit Sub
 
@@ -167,14 +162,8 @@ Public Class F_ENG
         Me.TbInertia.Text = ENG0.I_mot.ToString
         Me.TbNleerl.Text = ENG0.Nidle.ToString
 
-        Me.LvFLDs.Items.Clear()
-        For i = 0 To ENG0.fFLD.Count - 1
-            lv0 = New ListViewItem(ENG0.PathFLD(i, True))
-            lv0.SubItems.Add(ENG0.FLDgears(i))
-            Me.LvFLDs.Items.Add(lv0)
-        Next
-
-        Me.TbMAP.Text = ENG0.PathMAP(True)
+		Me.TbMAP.Text = ENG0.PathMAP(True)
+		Me.TbFLD.Text = ENG0.PathFLD(True)
         Me.TbWHTCurban.Text = ENG0.WHTCurban
         Me.TbWHTCrural.Text = ENG0.WHTCrural
         Me.TbWHTCmw.Text = ENG0.WHTCmw
@@ -209,7 +198,6 @@ Public Class F_ENG
     'Save VENG file to given filepath. Called by SaveOrSaveAs. 
     Private Function saveENG(ByVal file As String) As Boolean
         Dim ENG0 As cENG
-        Dim i As Int16
 
         ENG0 = New cENG
         ENG0.FilePath = file
@@ -220,13 +208,8 @@ Public Class F_ENG
         ENG0.I_mot = CSng(fTextboxToNumString(Me.TbInertia.Text))
         ENG0.Nidle = CSng(fTextboxToNumString(Me.TbNleerl.Text))
 
-        For i = 0 To Me.LvFLDs.Items.Count - 1
-            ENG0.fFLD.Add(New cSubPath)
-            ENG0.PathFLD(i) = Me.LvFLDs.Items(i).SubItems(0).Text
-            ENG0.FLDgears.Add(Me.LvFLDs.Items(i).SubItems(1).Text)
-        Next
-
-        ENG0.PathMAP = Me.TbMAP.Text
+		ENG0.PathFLD = Me.TbFLD.Text
+		ENG0.PathMAP = Me.TbMAP.Text
 
 
         ENG0.WHTCurban = CSng(fTextboxToNumString(Me.TbWHTCurban.Text))
@@ -234,8 +217,6 @@ Public Class F_ENG
         ENG0.WHTCmw = CSng(fTextboxToNumString(Me.TbWHTCmw.Text))
 
 
-
-
         If Not ENG0.SaveFile Then
             MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical)
             Return False
@@ -318,10 +299,10 @@ Public Class F_ENG
         Change()
     End Sub
 
-    Private Sub TbMAP_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMAP.TextChanged
-        UpdatePic()
-        Change()
-    End Sub
+	Private Sub TbMAP_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMAP.TextChanged, TbFLD.TextChanged
+		UpdatePic()
+		Change()
+	End Sub
 
     Private Sub TbWHTCurban_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbWHTCurban.TextChanged
         Change()
@@ -335,149 +316,33 @@ Public Class F_ENG
         Change()
     End Sub
 
-    Private Sub LvFLDs_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles LvFLDs.SelectedIndexChanged
-        UpdatePic()
-    End Sub
-
-
-
-#End Region
-
-#Region "Add/Remove/Edit VFLD entries"
-
-    Private Sub LvFLDs_DoubleClick(sender As Object, e As System.EventArgs) Handles LvFLDs.DoubleClick
-        EditFLD()
-    End Sub
-
-    Private Sub LvFLDs_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles LvFLDs.KeyDown
-        Select Case e.KeyCode
-            Case Keys.Delete, Keys.Back
-                RemoveFLD(False)
-            Case Keys.Enter
-                EditFLD()
-        End Select
-    End Sub
-
-    Private Sub BtAddFLD_Click(sender As System.Object, e As System.EventArgs) Handles BtAddFLD.Click
-        AddFLD()
-        Me.LvFLDs.Items(Me.LvFLDs.Items.Count - 1).Selected = True
-        EditFLD()
-    End Sub
-
-    Private Sub BtRemFLD_Click(sender As System.Object, e As System.EventArgs) Handles BtRemFLD.Click
-        RemoveFLD(False)
-    End Sub
-
-    Private Sub EditFLD()
-        Dim nums As String()
-
-        FLDdia.EngFile = EngFile
-        FLDdia.TbFLD.Text = Me.LvFLDs.SelectedItems(0).SubItems(0).Text
-
-        If Me.LvFLDs.SelectedItems(0).SubItems(1).Text.Contains("-") Then
-            Try
-                nums = Me.LvFLDs.SelectedItems(0).SubItems(1).Text.Replace(" ", "").Split("-")
-                FLDdia.NumGearFrom.Value = Math.Max(CInt(nums(0)), 0)
-                FLDdia.NumGearTo.Value = Math.Min(CInt(nums(1)), 99)
-            Catch ex As Exception
-                FLDdia.NumGearFrom.Value = 0
-                FLDdia.NumGearTo.Value = 99
-                MsgBox(Me.LvFLDs.SelectedItems(0).SubItems(1).Text & " is no valid range!")
-            End Try
-        Else
-            FLDdia.NumGearFrom.Value = Math.Max(CInt(Me.LvFLDs.SelectedItems(0).SubItems(1).Text), 0)
-            FLDdia.NumGearTo.Value = Math.Min(CInt(Me.LvFLDs.SelectedItems(0).SubItems(1).Text), 99)
-        End If
-
-        If FLDdia.ShowDialog = Windows.Forms.DialogResult.OK Then
-
-            Me.LvFLDs.SelectedItems(0).SubItems(0).Text = FLDdia.TbFLD.Text
-
-            If FLDdia.NumGearFrom.Value = FLDdia.NumGearTo.Value Then
-                Me.LvFLDs.SelectedItems(0).SubItems(1).Text = FLDdia.NumGearFrom.Value
-            Else
-                Me.LvFLDs.SelectedItems(0).SubItems(1).Text = FLDdia.NumGearFrom.Value & "-" & FLDdia.NumGearTo.Value
-            End If
-
-            UpdatePic()
-
-            Change()
-
-        Else
-
-            If Me.LvFLDs.SelectedItems(0).SubItems(0).Text = "" Then RemoveFLD(True)
-
-        End If
-
-
-    End Sub
-
-    Private Sub AddFLD()
-        Dim lvi As ListViewItem
-
-        lvi = New ListViewItem("")
-        lvi.SubItems.Add("0 - 99")
-        Me.LvFLDs.Items.Add(lvi)
-
-        lvi.EnsureVisible()
-
-        Me.LvFLDs.Focus()
-
-        'Change() => NO! Already in EditFLD
-
-    End Sub
-
-    Private Sub RemoveFLD(ByVal NoChange As Boolean)
-        Dim i0 As Int16
+	Private Sub LvFLDs_SelectedIndexChanged(sender As System.Object, e As System.EventArgs)
+		UpdatePic()
+	End Sub
 
-        If Me.LvFLDs.Items.Count = 0 Then Exit Sub
 
-        If Me.LvFLDs.SelectedItems.Count = 0 Then Me.LvFLDs.Items(Me.LvFLDs.Items.Count - 1).Selected = True
-
-        i0 = Me.LvFLDs.SelectedItems(0).Index
-
-        Me.LvFLDs.SelectedItems(0).Remove()
-
-        If i0 < Me.LvFLDs.Items.Count Then
-            Me.LvFLDs.Items(i0).Selected = True
-            Me.LvFLDs.Items(i0).EnsureVisible()
-        End If
-
-        Me.LvFLDs.Focus()
-        UpdatePic()
-
-
-        If Not NoChange Then Change()
-
-    End Sub
 
 #End Region
 
-
-    'Browse for VMAP file
-    Private Sub BtMAP_Click(sender As System.Object, e As System.EventArgs) Handles BtMAP.Click
-        If fbMAP.OpenDialog(fFileRepl(Me.TbMAP.Text, fPATH(EngFile))) Then Me.TbMAP.Text = fFileWoDir(fbMAP.Files(0), fPATH(EngFile))
-    End Sub
+	'Browse for VMAP file
+	Private Sub BtMAP_Click(sender As System.Object, e As System.EventArgs) Handles BtMAP.Click
+		If fbMAP.OpenDialog(fFileRepl(Me.TbMAP.Text, fPATH(EngFile))) Then Me.TbMAP.Text = fFileWoDir(fbMAP.Files(0), fPATH(EngFile))
+	End Sub
 
 
     'Open VMAP file
-    Private Sub BtMAPopen_Click(sender As System.Object, e As System.EventArgs) Handles BtMAPopen.Click
-        Dim fldfile As String
+	Private Sub BtMAPopen_Click(sender As System.Object, e As System.EventArgs) Handles BtMAPopen.Click
+		Dim fldfile As String
 
-        If Me.LvFLDs.Items.Count = 1 Then
-            fldfile = fFileRepl(Me.LvFLDs.Items(0).Text, fPATH(EngFile))
-        Else
-            fldfile = sKey.NoFile
-        End If
+		fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
 
+		If fldfile <> sKey.NoFile AndAlso IO.File.Exists(fldfile) Then
+			OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)), fldfile)
+		Else
+			OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)))
+		End If
 
-        If fldfile <> sKey.NoFile AndAlso IO.File.Exists(fldfile) Then
-            OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)), fldfile)
-        Else
-            OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)))
-        End If
-
-    End Sub
+	End Sub
 
 
     'Save and close
@@ -494,10 +359,8 @@ Public Class F_ENG
 
         Dim fldOK As Boolean = False
         Dim mapOK As Boolean = False
-        Dim fp As String
         Dim FLD0 As New cFLD
         Dim MAP0 As New cMAP
-        Dim Shiftpoly As cGBX.cShiftPolygon
         Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart
         Dim s As System.Windows.Forms.DataVisualization.Charting.Series
         Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea
@@ -508,18 +371,11 @@ Public Class F_ENG
         Try
 
             'Read Files
-            If Me.LvFLDs.Items.Count > 0 Then
-                If Me.LvFLDs.SelectedItems.Count > 0 Then
-                    fp = fFileRepl(Me.LvFLDs.SelectedItems(0).Text, fPATH(EngFile))
-                Else
-                    fp = fFileRepl(Me.LvFLDs.Items(0).Text, fPATH(EngFile))
-                End If
-                FLD0.FilePath = fp
-                fldOK = FLD0.ReadFile(False)
-            End If
+			FLD0.FilePath = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
+			fldOK = FLD0.ReadFile(False, False)
 
             MAP0.FilePath = fFileRepl(Me.TbMAP.Text, fPATH(EngFile))
-            mapOK = MAP0.ReadFile(False)
+			mapOK = MAP0.ReadFile(False)
 
         Catch ex As Exception
 
@@ -551,33 +407,7 @@ Public Class F_ENG
             s.BorderWidth = 2
             s.Color = Color.Blue
             s.Name = "Motoring (" & fFILE(FLD0.FilePath, True) & ")"
-            MyChart.Series.Add(s)
-
-            If IsNumeric(Me.TbNleerl.Text) AndAlso Me.TbNleerl.Text > 0 Then
-
-                If FLD0.Init(CSng(Me.TbNleerl.Text)) Then
-
-                    Shiftpoly = New cGBX.cShiftPolygon("", 0)
-                    Shiftpoly.SetGenericShiftPoly(FLD0, Me.TbNleerl.Text)
-
-                    s = New System.Windows.Forms.DataVisualization.Charting.Series
-                    s.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp)
-                    s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                    s.BorderWidth = 2
-                    s.Color = Color.DarkRed
-                    s.Name = "Upshift curve"
-                    MyChart.Series.Add(s)
-
-                    s = New System.Windows.Forms.DataVisualization.Charting.Series
-                    s.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown)
-                    s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                    s.BorderWidth = 2
-                    s.Color = Color.DarkRed
-                    s.Name = "Downshift curve"
-                    MyChart.Series.Add(s)
-                End If
-
-            End If
+			MyChart.Series.Add(s)
 
         End If
 
@@ -662,4 +492,19 @@ Public Class F_ENG
 
 
 
+	Private Sub BtFLD_Click(sender As Object, e As EventArgs) Handles BtFLD.Click
+		If fbFLD.OpenDialog(fFileRepl(Me.TbFLD.Text, fPATH(EngFile))) Then Me.TbFLD.Text = fFileWoDir(fbFLD.Files(0), fPATH(EngFile))
+
+	End Sub
+
+	Private Sub BtFLDopen_Click(sender As Object, e As EventArgs) Handles BtFLDopen.Click
+		Dim fldfile As String
+
+		fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
+
+		If fldfile <> sKey.NoFile AndAlso IO.File.Exists(fldfile) Then
+			OpenFiles(fldfile)
+		End If
+
+	End Sub
 End Class
diff --git a/VECTO/GUI/F_FLD.Designer.vb b/VECTO/GUI/F_FLD.Designer.vb
deleted file mode 100644
index 532964844e40efaefa56c705c91c385e35fcc39e..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_FLD.Designer.vb
+++ /dev/null
@@ -1,251 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_FLD
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
-
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-        Me.OK_Button = New System.Windows.Forms.Button()
-        Me.Cancel_Button = New System.Windows.Forms.Button()
-        Me.BtFLDOpen = New System.Windows.Forms.Button()
-        Me.BtFLD = New System.Windows.Forms.Button()
-        Me.TbFLD = New System.Windows.Forms.TextBox()
-        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.NumGearTo = New System.Windows.Forms.NumericUpDown()
-        Me.NumGearFrom = New System.Windows.Forms.NumericUpDown()
-        Me.TableLayoutPanel1.SuspendLayout()
-        Me.CmOpenFile.SuspendLayout()
-        Me.GroupBox1.SuspendLayout()
-        CType(Me.NumGearTo, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.NumGearFrom, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'TableLayoutPanel1
-        '
-        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TableLayoutPanel1.ColumnCount = 2
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
-        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(345, 131)
-        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-        Me.TableLayoutPanel1.RowCount = 1
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
-        Me.TableLayoutPanel1.TabIndex = 4
-        '
-        'OK_Button
-        '
-        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
-        Me.OK_Button.Name = "OK_Button"
-        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
-        Me.OK_Button.Text = "OK"
-        '
-        'Cancel_Button
-        '
-        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
-        Me.Cancel_Button.Name = "Cancel_Button"
-        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
-        Me.Cancel_Button.Text = "Cancel"
-        '
-        'BtFLDOpen
-        '
-        Me.BtFLDOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtFLDOpen.Location = New System.Drawing.Point(470, 23)
-        Me.BtFLDOpen.Name = "BtFLDOpen"
-        Me.BtFLDOpen.Size = New System.Drawing.Size(23, 23)
-        Me.BtFLDOpen.TabIndex = 2
-        Me.BtFLDOpen.TabStop = False
-        Me.BtFLDOpen.UseVisualStyleBackColor = True
-        '
-        'BtFLD
-        '
-        Me.BtFLD.Location = New System.Drawing.Point(436, 23)
-        Me.BtFLD.Name = "BtFLD"
-        Me.BtFLD.Size = New System.Drawing.Size(28, 23)
-        Me.BtFLD.TabIndex = 1
-        Me.BtFLD.TabStop = False
-        Me.BtFLD.Text = "..."
-        Me.BtFLD.UseVisualStyleBackColor = True
-        '
-        'TbFLD
-        '
-        Me.TbFLD.Location = New System.Drawing.Point(12, 25)
-        Me.TbFLD.Name = "TbFLD"
-        Me.TbFLD.Size = New System.Drawing.Size(418, 20)
-        Me.TbFLD.TabIndex = 0
-        '
-        'CmOpenFile
-        '
-        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-        Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
-        '
-        'OpenWithToolStripMenuItem
-        '
-        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-        '
-        'ShowInFolderToolStripMenuItem
-        '
-        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(12, 9)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(157, 13)
-        Me.Label4.TabIndex = 45
-        Me.Label4.Text = "Full Load and Drag Curve (.vfld)"
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.Label3)
-        Me.GroupBox1.Controls.Add(Me.Label2)
-        Me.GroupBox1.Controls.Add(Me.Label1)
-        Me.GroupBox1.Controls.Add(Me.NumGearTo)
-        Me.GroupBox1.Controls.Add(Me.NumGearFrom)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 51)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(479, 64)
-        Me.GroupBox1.TabIndex = 3
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Assigned Gears"
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(225, 31)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(229, 13)
-        Me.Label3.TabIndex = 2
-        Me.Label3.Text = "Gear 0 is used for Idling and Engine Only Mode"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(129, 31)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(20, 13)
-        Me.Label2.TabIndex = 1
-        Me.Label2.Text = "To"
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(14, 31)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(30, 13)
-        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "From"
-        '
-        'NumGearTo
-        '
-        Me.NumGearTo.Location = New System.Drawing.Point(155, 29)
-        Me.NumGearTo.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
-        Me.NumGearTo.Name = "NumGearTo"
-        Me.NumGearTo.Size = New System.Drawing.Size(51, 20)
-        Me.NumGearTo.TabIndex = 1
-        '
-        'NumGearFrom
-        '
-        Me.NumGearFrom.Location = New System.Drawing.Point(50, 29)
-        Me.NumGearFrom.Maximum = New Decimal(New Integer() {99, 0, 0, 0})
-        Me.NumGearFrom.Name = "NumGearFrom"
-        Me.NumGearFrom.Size = New System.Drawing.Size(51, 20)
-        Me.NumGearFrom.TabIndex = 0
-        '
-        'F_FLD
-        '
-        Me.AcceptButton = Me.OK_Button
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.Cancel_Button
-        Me.ClientSize = New System.Drawing.Size(503, 172)
-        Me.Controls.Add(Me.GroupBox1)
-        Me.Controls.Add(Me.Label4)
-        Me.Controls.Add(Me.BtFLDOpen)
-        Me.Controls.Add(Me.BtFLD)
-        Me.Controls.Add(Me.TbFLD)
-        Me.Controls.Add(Me.TableLayoutPanel1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "F_FLD"
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "Full load and Drag Curve"
-        Me.TableLayoutPanel1.ResumeLayout(False)
-        Me.CmOpenFile.ResumeLayout(False)
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
-        CType(Me.NumGearTo, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.NumGearFrom, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
-    Friend WithEvents OK_Button As System.Windows.Forms.Button
-    Friend WithEvents Cancel_Button As System.Windows.Forms.Button
-    Friend WithEvents BtFLDOpen As System.Windows.Forms.Button
-    Friend WithEvents BtFLD As System.Windows.Forms.Button
-    Friend WithEvents TbFLD As System.Windows.Forms.TextBox
-    Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-    Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents NumGearTo As System.Windows.Forms.NumericUpDown
-    Friend WithEvents NumGearFrom As System.Windows.Forms.NumericUpDown
-    Friend WithEvents Label3 As System.Windows.Forms.Label
-
-End Class
diff --git a/VECTO/GUI/F_FLD.vb b/VECTO/GUI/F_FLD.vb
deleted file mode 100644
index 2ac5ac495b59118f4f65d7f4ac7d2e5476f2aaba..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_FLD.vb
+++ /dev/null
@@ -1,91 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-Imports System.Windows.Forms
-
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-''' <summary>
-''' Dialog for selecting VFLD files and assign Gears.
-''' </summary>
-''' <remarks></remarks>
-Public Class F_FLD
-
-    'Parent Engine file
-    Public EngFile As String = ""
-
-    'Save and close
-    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-
-        If Trim(Me.TbFLD.Text) = "" Then
-            MsgBox("No file defined!")
-            Me.TbFLD.Focus()
-            Me.TbFLD.SelectAll()
-            Exit Sub
-        End If
-
-        If Me.NumGearTo.Value < Me.NumGearFrom.Value Then
-            MsgBox("Invalid gear range!")
-            Exit Sub
-        End If
-
-        Me.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Close()
-    End Sub
-
-    'Cancel
-    Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
-        Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Close()
-    End Sub
-
-    'Browse for VFLD file
-    Private Sub BtFLD_Click(sender As System.Object, e As System.EventArgs) Handles BtFLD.Click
-        If fbFLD.OpenDialog(fFileRepl(Me.TbFLD.Text, fPATH(EngFile))) Then Me.TbFLD.Text = fFileWoDir(fbFLD.Files(0), fPATH(EngFile))
-    End Sub
-
-    'Open VFLD file
-    Private Sub BtFLDOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtFLDOpen.Click
-        OpenFiles(fFileRepl(Me.TbFLD.Text, fPATH(EngFile)))
-    End Sub
-
-#Region "Open File Context Menu"
-
-    Private CmFiles As String()
-
-    Private Sub OpenFiles(ParamArray files() As String)
-
-        If files.Length = 0 Then Exit Sub
-
-        CmFiles = files
-
-        OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
-
-        CmOpenFile.Show(Cursor.Position)
-
-    End Sub
-
-    Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
-        If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
-    End Sub
-
-    Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
-        If IO.File.Exists(CmFiles(0)) Then
-            Try
-                System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
-            Catch ex As Exception
-                MsgBox("Failed to open file!")
-            End Try
-        Else
-            MsgBox("File not found!")
-        End If
-    End Sub
-
-#End Region
-
-End Class
diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 783305eae6f3352b5c8dfc5dd70e9dbc6e9c0505..7951eac0e575a07d09ff44849ec9b960f94965ea 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -32,803 +32,809 @@ Partial Class F_GBX
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_GBX))
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ButCancel = New System.Windows.Forms.Button()
-        Me.ButOK = New System.Windows.Forms.Button()
-        Me.TbTracInt = New System.Windows.Forms.TextBox()
-        Me.LvGears = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.TBI_getr = New System.Windows.Forms.TextBox()
-        Me.Label49 = New System.Windows.Forms.Label()
-        Me.Label33 = New System.Windows.Forms.Label()
-        Me.Label48 = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.TbName = New System.Windows.Forms.TextBox()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.BtRemGear = New System.Windows.Forms.Button()
-        Me.GrGearShift = New System.Windows.Forms.GroupBox()
-        Me.PnTorqRes = New System.Windows.Forms.Panel()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.TbTqResv = New System.Windows.Forms.TextBox()
-        Me.ChShiftInside = New System.Windows.Forms.CheckBox()
-        Me.TbShiftTime = New System.Windows.Forms.TextBox()
-        Me.Label12 = New System.Windows.Forms.Label()
-        Me.Label13 = New System.Windows.Forms.Label()
-        Me.ChSkipGears = New System.Windows.Forms.CheckBox()
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.TbStartAcc = New System.Windows.Forms.TextBox()
-        Me.Label11 = New System.Windows.Forms.Label()
-        Me.TbStartSpeed = New System.Windows.Forms.TextBox()
-        Me.Label9 = New System.Windows.Forms.Label()
-        Me.Label10 = New System.Windows.Forms.Label()
-        Me.TbTqResvStart = New System.Windows.Forms.TextBox()
-        Me.Label8 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
-        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.PnTC = New System.Windows.Forms.Panel()
-        Me.Label17 = New System.Windows.Forms.Label()
-        Me.Label15 = New System.Windows.Forms.Label()
-        Me.Label14 = New System.Windows.Forms.Label()
-        Me.BtTCfileBrowse = New System.Windows.Forms.Button()
-        Me.TbTCfile = New System.Windows.Forms.TextBox()
-        Me.BtTCfileOpen = New System.Windows.Forms.Button()
-        Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
-        Me.ChTCon = New System.Windows.Forms.CheckBox()
-        Me.Label16 = New System.Windows.Forms.Label()
-        Me.CbGStype = New System.Windows.Forms.ComboBox()
-        Me.BtAddGear = New System.Windows.Forms.Button()
-        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
-        Me.Label32 = New System.Windows.Forms.Label()
-        Me.PnInertiaTI = New System.Windows.Forms.Panel()
-        Me.PicBox = New System.Windows.Forms.PictureBox()
-        Me.TbTCinertia = New System.Windows.Forms.TextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label18 = New System.Windows.Forms.Label()
-        Me.ToolStrip1.SuspendLayout()
-        Me.StatusStrip1.SuspendLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.GrGearShift.SuspendLayout()
-        Me.PnTorqRes.SuspendLayout()
-        Me.GroupBox2.SuspendLayout()
-        Me.CmOpenFile.SuspendLayout()
-        Me.GroupBox3.SuspendLayout()
-        Me.PnTC.SuspendLayout()
-        Me.GroupBox4.SuspendLayout()
-        Me.PnInertiaTI.SuspendLayout()
-        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(877, 25)
-        Me.ToolStrip1.TabIndex = 30
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripBtNew
-        '
-        Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
-        Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtNew.Text = "ToolStripButton1"
-        Me.ToolStripBtNew.ToolTipText = "New"
-        '
-        'ToolStripBtOpen
-        '
-        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
-        Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtOpen.Text = "ToolStripButton1"
-        Me.ToolStripBtOpen.ToolTipText = "Open..."
-        '
-        'ToolStripBtSave
-        '
-        Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
-        Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSave.Text = "ToolStripButton1"
-        Me.ToolStripBtSave.ToolTipText = "Save"
-        '
-        'ToolStripBtSaveAs
-        '
-        Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
-        Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
-        Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-        '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripBtSendTo
-        '
-        Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
-        Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSendTo.Text = "Send to Job Editor"
-        Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton1.Text = "Help"
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 595)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
-        Me.StatusStrip1.SizingGrip = False
-        Me.StatusStrip1.TabIndex = 37
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'LbStatus
-        '
-        Me.LbStatus.Name = "LbStatus"
-        Me.LbStatus.Size = New System.Drawing.Size(39, 17)
-        Me.LbStatus.Text = "Status"
-        '
-        'ButCancel
-        '
-        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.ButCancel.Location = New System.Drawing.Point(790, 569)
-        Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 9
-        Me.ButCancel.Text = "Cancel"
-        Me.ButCancel.UseVisualStyleBackColor = True
-        '
-        'ButOK
-        '
-        Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButOK.Location = New System.Drawing.Point(709, 569)
-        Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 8
-        Me.ButOK.Text = "Save"
-        Me.ButOK.UseVisualStyleBackColor = True
-        '
-        'TbTracInt
-        '
-        Me.TbTracInt.Location = New System.Drawing.Point(303, 3)
-        Me.TbTracInt.Name = "TbTracInt"
-        Me.TbTracInt.Size = New System.Drawing.Size(40, 20)
-        Me.TbTracInt.TabIndex = 5
-        '
-        'LvGears
-        '
-        Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader4, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5})
-        Me.LvGears.FullRowSelect = True
-        Me.LvGears.GridLines = True
-        Me.LvGears.HideSelection = False
-        Me.LvGears.Location = New System.Drawing.Point(6, 18)
-        Me.LvGears.MultiSelect = False
-        Me.LvGears.Name = "LvGears"
-        Me.LvGears.Size = New System.Drawing.Size(429, 183)
-        Me.LvGears.TabIndex = 2
-        Me.LvGears.TabStop = False
-        Me.LvGears.UseCompatibleStateImageBehavior = False
-        Me.LvGears.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "Gear"
-        Me.ColumnHeader1.Width = 40
-        '
-        'ColumnHeader4
-        '
-        Me.ColumnHeader4.Text = "TC"
-        Me.ColumnHeader4.Width = 31
-        '
-        'ColumnHeader2
-        '
-        Me.ColumnHeader2.Text = "Ratio"
-        Me.ColumnHeader2.Width = 55
-        '
-        'ColumnHeader3
-        '
-        Me.ColumnHeader3.Text = "Loss Map or Efficiency [-]"
-        Me.ColumnHeader3.Width = 137
-        '
-        'ColumnHeader5
-        '
-        Me.ColumnHeader5.Text = "Shift polygons"
-        Me.ColumnHeader5.Width = 97
-        '
-        'TBI_getr
-        '
-        Me.TBI_getr.Location = New System.Drawing.Point(53, 3)
-        Me.TBI_getr.Name = "TBI_getr"
-        Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
-        Me.TBI_getr.TabIndex = 4
-        '
-        'Label49
-        '
-        Me.Label49.AutoSize = True
-        Me.Label49.Location = New System.Drawing.Point(349, 6)
-        Me.Label49.Name = "Label49"
-        Me.Label49.Size = New System.Drawing.Size(18, 13)
-        Me.Label49.TabIndex = 2
-        Me.Label49.Text = "[s]"
-        '
-        'Label33
-        '
-        Me.Label33.AutoSize = True
-        Me.Label33.Location = New System.Drawing.Point(116, 6)
-        Me.Label33.Name = "Label33"
-        Me.Label33.Size = New System.Drawing.Size(36, 13)
-        Me.Label33.TabIndex = 2
-        Me.Label33.Text = "[kgm²]"
-        '
-        'Label48
-        '
-        Me.Label48.AutoSize = True
-        Me.Label48.Location = New System.Drawing.Point(195, 6)
-        Me.Label48.Name = "Label48"
-        Me.Label48.Size = New System.Drawing.Size(102, 13)
-        Me.Label48.TabIndex = 2
-        Me.Label48.Text = "Traction Interruption"
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(11, 6)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(36, 13)
-        Me.Label6.TabIndex = 2
-        Me.Label6.Text = "Inertia"
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(26, 85)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(87, 13)
-        Me.Label3.TabIndex = 42
-        Me.Label3.Text = "Make and Model"
-        '
-        'TbName
-        '
-        Me.TbName.Location = New System.Drawing.Point(119, 82)
-        Me.TbName.Name = "TbName"
-        Me.TbName.Size = New System.Drawing.Size(334, 20)
-        Me.TbName.TabIndex = 0
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.BackColor = System.Drawing.Color.White
-        Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_GBX
-        Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(441, 40)
-        Me.PictureBox1.TabIndex = 43
-        Me.PictureBox1.TabStop = False
-        '
-        'BtRemGear
-        '
-        Me.BtRemGear.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.BtRemGear.Location = New System.Drawing.Point(41, 207)
-        Me.BtRemGear.Name = "BtRemGear"
-        Me.BtRemGear.Size = New System.Drawing.Size(29, 23)
-        Me.BtRemGear.TabIndex = 3
-        Me.BtRemGear.UseVisualStyleBackColor = True
-        '
-        'GrGearShift
-        '
-        Me.GrGearShift.Controls.Add(Me.PnTorqRes)
-        Me.GrGearShift.Controls.Add(Me.ChShiftInside)
-        Me.GrGearShift.Controls.Add(Me.TbShiftTime)
-        Me.GrGearShift.Controls.Add(Me.Label12)
-        Me.GrGearShift.Controls.Add(Me.Label13)
-        Me.GrGearShift.Controls.Add(Me.ChSkipGears)
-        Me.GrGearShift.Controls.Add(Me.GroupBox2)
-        Me.GrGearShift.Location = New System.Drawing.Point(12, 377)
-        Me.GrGearShift.Name = "GrGearShift"
-        Me.GrGearShift.Size = New System.Drawing.Size(441, 182)
-        Me.GrGearShift.TabIndex = 6
-        Me.GrGearShift.TabStop = False
-        Me.GrGearShift.Text = "Gear shift parameters"
-        '
-        'PnTorqRes
-        '
-        Me.PnTorqRes.Controls.Add(Me.Label2)
-        Me.PnTorqRes.Controls.Add(Me.Label4)
-        Me.PnTorqRes.Controls.Add(Me.TbTqResv)
-        Me.PnTorqRes.Location = New System.Drawing.Point(230, 19)
-        Me.PnTorqRes.Name = "PnTorqRes"
-        Me.PnTorqRes.Size = New System.Drawing.Size(190, 32)
-        Me.PnTorqRes.TabIndex = 5
-        '
-        'Label2
-        '
-        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(10, 9)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(79, 13)
-        Me.Label2.TabIndex = 0
-        Me.Label2.Text = "Torque reserve"
-        '
-        'Label4
-        '
-        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(158, 9)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(21, 13)
-        Me.Label4.TabIndex = 0
-        Me.Label4.Text = "[%]"
-        '
-        'TbTqResv
-        '
-        Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbTqResv.Location = New System.Drawing.Point(95, 6)
-        Me.TbTqResv.Name = "TbTqResv"
-        Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
-        Me.TbTqResv.TabIndex = 3
-        '
-        'ChShiftInside
-        '
-        Me.ChShiftInside.AutoSize = True
-        Me.ChShiftInside.Checked = True
-        Me.ChShiftInside.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.ChShiftInside.Location = New System.Drawing.Point(9, 27)
-        Me.ChShiftInside.Name = "ChShiftInside"
-        Me.ChShiftInside.Size = New System.Drawing.Size(195, 17)
-        Me.ChShiftInside.TabIndex = 3
-        Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT)"
-        Me.ChShiftInside.UseVisualStyleBackColor = True
-        '
-        'TbShiftTime
-        '
-        Me.TbShiftTime.Location = New System.Drawing.Point(325, 51)
-        Me.TbShiftTime.Name = "TbShiftTime"
-        Me.TbShiftTime.Size = New System.Drawing.Size(57, 20)
-        Me.TbShiftTime.TabIndex = 6
-        '
-        'Label12
-        '
-        Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(388, 54)
-        Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(18, 13)
-        Me.Label12.TabIndex = 9
-        Me.Label12.Text = "[s]"
-        '
-        'Label13
-        '
-        Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(227, 54)
-        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(92, 13)
-        Me.Label13.TabIndex = 8
-        Me.Label13.Text = "Minimum shift time"
-        '
-        'ChSkipGears
-        '
-        Me.ChSkipGears.AutoSize = True
-        Me.ChSkipGears.Location = New System.Drawing.Point(9, 53)
-        Me.ChSkipGears.Name = "ChSkipGears"
-        Me.ChSkipGears.Size = New System.Drawing.Size(132, 17)
-        Me.ChSkipGears.TabIndex = 4
-        Me.ChSkipGears.Text = "Skip Gears (MT, AMT)"
-        Me.ChSkipGears.UseVisualStyleBackColor = True
-        '
-        'GroupBox2
-        '
-        Me.GroupBox2.Controls.Add(Me.TbStartAcc)
-        Me.GroupBox2.Controls.Add(Me.Label11)
-        Me.GroupBox2.Controls.Add(Me.TbStartSpeed)
-        Me.GroupBox2.Controls.Add(Me.Label9)
-        Me.GroupBox2.Controls.Add(Me.Label10)
-        Me.GroupBox2.Controls.Add(Me.TbTqResvStart)
-        Me.GroupBox2.Controls.Add(Me.Label8)
-        Me.GroupBox2.Controls.Add(Me.Label5)
-        Me.GroupBox2.Controls.Add(Me.Label7)
-        Me.GroupBox2.Location = New System.Drawing.Point(6, 77)
-        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
-        Me.GroupBox2.TabIndex = 7
-        Me.GroupBox2.TabStop = False
-        Me.GroupBox2.Text = "Start Gear"
-        '
-        'TbStartAcc
-        '
-        Me.TbStartAcc.Location = New System.Drawing.Point(209, 71)
-        Me.TbStartAcc.Name = "TbStartAcc"
-        Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
-        Me.TbStartAcc.TabIndex = 2
-        '
-        'Label11
-        '
-        Me.Label11.AutoSize = True
-        Me.Label11.Location = New System.Drawing.Point(20, 74)
-        Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(173, 13)
-        Me.Label11.TabIndex = 0
-        Me.Label11.Text = "Reference acceleration at clutch-in"
-        '
-        'TbStartSpeed
-        '
-        Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45)
-        Me.TbStartSpeed.Name = "TbStartSpeed"
-        Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20)
-        Me.TbStartSpeed.TabIndex = 1
-        '
-        'Label9
-        '
-        Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(20, 48)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(181, 13)
-        Me.Label9.TabIndex = 0
-        Me.Label9.Text = "Reference vehicle speed at clutch-in"
-        '
-        'Label10
-        '
-        Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(272, 74)
-        Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(34, 13)
-        Me.Label10.TabIndex = 0
-        Me.Label10.Text = "[m/s²]"
-        '
-        'TbTqResvStart
-        '
-        Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19)
-        Me.TbTqResvStart.Name = "TbTqResvStart"
-        Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20)
-        Me.TbTqResvStart.TabIndex = 0
-        '
-        'Label8
-        '
-        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(272, 48)
-        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(31, 13)
-        Me.Label8.TabIndex = 0
-        Me.Label8.Text = "[m/s]"
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(20, 22)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(79, 13)
-        Me.Label5.TabIndex = 0
-        Me.Label5.Text = "Torque reserve"
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(272, 22)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(21, 13)
-        Me.Label7.TabIndex = 0
-        Me.Label7.Text = "[%]"
-        '
-        'CmOpenFile
-        '
-        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-        Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
-        '
-        'OpenWithToolStripMenuItem
-        '
-        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-        '
-        'ShowInFolderToolStripMenuItem
-        '
-        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-        '
-        'GroupBox3
-        '
-        Me.GroupBox3.Controls.Add(Me.PnTC)
-        Me.GroupBox3.Controls.Add(Me.ChTCon)
-        Me.GroupBox3.Location = New System.Drawing.Point(459, 440)
-        Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(414, 119)
-        Me.GroupBox3.TabIndex = 7
-        Me.GroupBox3.TabStop = False
-        Me.GroupBox3.Text = "Torque Converter"
-        '
-        'PnTC
-        '
-        Me.PnTC.Controls.Add(Me.Label17)
-        Me.PnTC.Controls.Add(Me.Label18)
-        Me.PnTC.Controls.Add(Me.Label15)
-        Me.PnTC.Controls.Add(Me.TbTCinertia)
-        Me.PnTC.Controls.Add(Me.Label1)
-        Me.PnTC.Controls.Add(Me.Label14)
-        Me.PnTC.Controls.Add(Me.BtTCfileBrowse)
-        Me.PnTC.Controls.Add(Me.TbTCfile)
-        Me.PnTC.Controls.Add(Me.BtTCfileOpen)
-        Me.PnTC.Controls.Add(Me.TbTCrefrpm)
-        Me.PnTC.Location = New System.Drawing.Point(6, 39)
-        Me.PnTC.Name = "PnTC"
-        Me.PnTC.Size = New System.Drawing.Size(402, 72)
-        Me.PnTC.TabIndex = 36
-        '
-        'Label17
-        '
-        Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(0, 5)
-        Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(176, 13)
-        Me.Label17.TabIndex = 0
-        Me.Label17.Text = "Torque converter characteristics file"
-        '
-        'Label15
-        '
-        Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(185, 50)
-        Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(77, 13)
-        Me.Label15.TabIndex = 0
-        Me.Label15.Text = "Reference rpm"
-        '
-        'Label14
-        '
-        Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(341, 50)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(40, 13)
-        Me.Label14.TabIndex = 0
-        Me.Label14.Text = "[1/min]"
-        '
-        'BtTCfileBrowse
-        '
-        Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtTCfileBrowse.Location = New System.Drawing.Point(341, 19)
-        Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
-        Me.BtTCfileBrowse.Size = New System.Drawing.Size(32, 23)
-        Me.BtTCfileBrowse.TabIndex = 1
-        Me.BtTCfileBrowse.TabStop = False
-        Me.BtTCfileBrowse.Text = "..."
-        Me.BtTCfileBrowse.UseVisualStyleBackColor = True
-        '
-        'TbTCfile
-        '
-        Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbTCfile.Location = New System.Drawing.Point(0, 21)
-        Me.TbTCfile.Name = "TbTCfile"
-        Me.TbTCfile.Size = New System.Drawing.Size(335, 20)
-        Me.TbTCfile.TabIndex = 0
-        '
-        'BtTCfileOpen
-        '
-        Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtTCfileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtTCfileOpen.Location = New System.Drawing.Point(379, 19)
-        Me.BtTCfileOpen.Name = "BtTCfileOpen"
-        Me.BtTCfileOpen.Size = New System.Drawing.Size(23, 23)
-        Me.BtTCfileOpen.TabIndex = 2
-        Me.BtTCfileOpen.TabStop = False
-        Me.BtTCfileOpen.UseVisualStyleBackColor = True
-        '
-        'TbTCrefrpm
-        '
-        Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbTCrefrpm.Location = New System.Drawing.Point(268, 47)
-        Me.TbTCrefrpm.Name = "TbTCrefrpm"
-        Me.TbTCrefrpm.Size = New System.Drawing.Size(67, 20)
-        Me.TbTCrefrpm.TabIndex = 3
-        '
-        'ChTCon
-        '
-        Me.ChTCon.AutoSize = True
-        Me.ChTCon.Checked = True
-        Me.ChTCon.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.ChTCon.Location = New System.Drawing.Point(9, 19)
-        Me.ChTCon.Name = "ChTCon"
-        Me.ChTCon.Size = New System.Drawing.Size(88, 17)
-        Me.ChTCon.TabIndex = 0
-        Me.ChTCon.Text = "Installed (AT)"
-        Me.ChTCon.UseVisualStyleBackColor = True
-        '
-        'Label16
-        '
-        Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(18, 111)
-        Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(95, 13)
-        Me.Label16.TabIndex = 45
-        Me.Label16.Text = "Transmission Type"
-        '
-        'CbGStype
-        '
-        Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.CbGStype.FormattingEnabled = True
-        Me.CbGStype.Location = New System.Drawing.Point(119, 108)
-        Me.CbGStype.Name = "CbGStype"
-        Me.CbGStype.Size = New System.Drawing.Size(227, 21)
-        Me.CbGStype.TabIndex = 1
-        '
-        'BtAddGear
-        '
-        Me.BtAddGear.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.BtAddGear.Location = New System.Drawing.Point(6, 207)
-        Me.BtAddGear.Name = "BtAddGear"
-        Me.BtAddGear.Size = New System.Drawing.Size(29, 23)
-        Me.BtAddGear.TabIndex = 3
-        Me.BtAddGear.UseVisualStyleBackColor = True
-        '
-        'GroupBox4
-        '
-        Me.GroupBox4.Controls.Add(Me.Label32)
-        Me.GroupBox4.Controls.Add(Me.LvGears)
-        Me.GroupBox4.Controls.Add(Me.BtRemGear)
-        Me.GroupBox4.Controls.Add(Me.BtAddGear)
-        Me.GroupBox4.Location = New System.Drawing.Point(12, 135)
-        Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Size = New System.Drawing.Size(441, 236)
-        Me.GroupBox4.TabIndex = 46
-        Me.GroupBox4.TabStop = False
-        Me.GroupBox4.Text = "Gears"
-        '
-        'Label32
-        '
-        Me.Label32.AutoSize = True
-        Me.Label32.Location = New System.Drawing.Point(312, 212)
-        Me.Label32.Name = "Label32"
-        Me.Label32.Size = New System.Drawing.Size(123, 13)
-        Me.Label32.TabIndex = 35
-        Me.Label32.Text = "Double-Click to edit gear"
-        '
-        'PnInertiaTI
-        '
-        Me.PnInertiaTI.Controls.Add(Me.Label6)
-        Me.PnInertiaTI.Controls.Add(Me.TBI_getr)
-        Me.PnInertiaTI.Controls.Add(Me.Label33)
-        Me.PnInertiaTI.Controls.Add(Me.Label48)
-        Me.PnInertiaTI.Controls.Add(Me.Label49)
-        Me.PnInertiaTI.Controls.Add(Me.TbTracInt)
-        Me.PnInertiaTI.Location = New System.Drawing.Point(469, 406)
-        Me.PnInertiaTI.Name = "PnInertiaTI"
-        Me.PnInertiaTI.Size = New System.Drawing.Size(398, 30)
-        Me.PnInertiaTI.TabIndex = 47
-        '
-        'PicBox
-        '
-        Me.PicBox.BackColor = System.Drawing.Color.LightGray
-        Me.PicBox.Location = New System.Drawing.Point(459, 28)
-        Me.PicBox.Name = "PicBox"
-        Me.PicBox.Size = New System.Drawing.Size(406, 372)
-        Me.PicBox.TabIndex = 48
-        Me.PicBox.TabStop = False
-        '
-        'TbTCinertia
-        '
-        Me.TbTCinertia.Location = New System.Drawing.Point(47, 47)
-        Me.TbTCinertia.Name = "TbTCinertia"
-        Me.TbTCinertia.Size = New System.Drawing.Size(67, 20)
-        Me.TbTCinertia.TabIndex = 49
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(120, 50)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(36, 13)
-        Me.Label1.TabIndex = 2
-        Me.Label1.Text = "[kgm²]"
-        '
-        'Label18
-        '
-        Me.Label18.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(5, 50)
-        Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(36, 13)
-        Me.Label18.TabIndex = 2
-        Me.Label18.Text = "Inertia"
-        '
-        'F_GBX
-        '
-        Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(877, 617)
-        Me.Controls.Add(Me.PicBox)
-        Me.Controls.Add(Me.PnInertiaTI)
-        Me.Controls.Add(Me.GroupBox4)
-        Me.Controls.Add(Me.CbGStype)
-        Me.Controls.Add(Me.Label16)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.GrGearShift)
-        Me.Controls.Add(Me.GroupBox3)
-        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.TbName)
-        Me.Controls.Add(Me.ButCancel)
-        Me.Controls.Add(Me.ButOK)
-        Me.Controls.Add(Me.StatusStrip1)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
-        Me.Name = "F_GBX"
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "F_GBX"
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GrGearShift.ResumeLayout(False)
-        Me.GrGearShift.PerformLayout()
-        Me.PnTorqRes.ResumeLayout(False)
-        Me.PnTorqRes.PerformLayout()
-        Me.GroupBox2.ResumeLayout(False)
-        Me.GroupBox2.PerformLayout()
-        Me.CmOpenFile.ResumeLayout(False)
-        Me.GroupBox3.ResumeLayout(False)
-        Me.GroupBox3.PerformLayout()
-        Me.PnTC.ResumeLayout(False)
-        Me.PnTC.PerformLayout()
-        Me.GroupBox4.ResumeLayout(False)
-        Me.GroupBox4.PerformLayout()
-        Me.PnInertiaTI.ResumeLayout(False)
-        Me.PnInertiaTI.PerformLayout()
-        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+		Me.components = New System.ComponentModel.Container()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_GBX))
+		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+		Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+		Me.ButCancel = New System.Windows.Forms.Button()
+		Me.ButOK = New System.Windows.Forms.Button()
+		Me.TbTracInt = New System.Windows.Forms.TextBox()
+		Me.LvGears = New System.Windows.Forms.ListView()
+		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.TBI_getr = New System.Windows.Forms.TextBox()
+		Me.Label49 = New System.Windows.Forms.Label()
+		Me.Label33 = New System.Windows.Forms.Label()
+		Me.Label48 = New System.Windows.Forms.Label()
+		Me.Label6 = New System.Windows.Forms.Label()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.TbName = New System.Windows.Forms.TextBox()
+		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+		Me.BtRemGear = New System.Windows.Forms.Button()
+		Me.GrGearShift = New System.Windows.Forms.GroupBox()
+		Me.PnTorqRes = New System.Windows.Forms.Panel()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.TbTqResv = New System.Windows.Forms.TextBox()
+		Me.ChShiftInside = New System.Windows.Forms.CheckBox()
+		Me.TbShiftTime = New System.Windows.Forms.TextBox()
+		Me.Label12 = New System.Windows.Forms.Label()
+		Me.Label13 = New System.Windows.Forms.Label()
+		Me.ChSkipGears = New System.Windows.Forms.CheckBox()
+		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+		Me.TbStartAcc = New System.Windows.Forms.TextBox()
+		Me.Label11 = New System.Windows.Forms.Label()
+		Me.TbStartSpeed = New System.Windows.Forms.TextBox()
+		Me.Label9 = New System.Windows.Forms.Label()
+		Me.Label10 = New System.Windows.Forms.Label()
+		Me.TbTqResvStart = New System.Windows.Forms.TextBox()
+		Me.Label8 = New System.Windows.Forms.Label()
+		Me.Label5 = New System.Windows.Forms.Label()
+		Me.Label7 = New System.Windows.Forms.Label()
+		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+		Me.PnTC = New System.Windows.Forms.Panel()
+		Me.Label17 = New System.Windows.Forms.Label()
+		Me.Label18 = New System.Windows.Forms.Label()
+		Me.Label15 = New System.Windows.Forms.Label()
+		Me.TbTCinertia = New System.Windows.Forms.TextBox()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.Label14 = New System.Windows.Forms.Label()
+		Me.BtTCfileBrowse = New System.Windows.Forms.Button()
+		Me.TbTCfile = New System.Windows.Forms.TextBox()
+		Me.BtTCfileOpen = New System.Windows.Forms.Button()
+		Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
+		Me.ChTCon = New System.Windows.Forms.CheckBox()
+		Me.Label16 = New System.Windows.Forms.Label()
+		Me.CbGStype = New System.Windows.Forms.ComboBox()
+		Me.BtAddGear = New System.Windows.Forms.Button()
+		Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+		Me.Label32 = New System.Windows.Forms.Label()
+		Me.PnInertiaTI = New System.Windows.Forms.Panel()
+		Me.PicBox = New System.Windows.Forms.PictureBox()
+		Me.ToolStrip1.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.GrGearShift.SuspendLayout()
+		Me.PnTorqRes.SuspendLayout()
+		Me.GroupBox2.SuspendLayout()
+		Me.CmOpenFile.SuspendLayout()
+		Me.GroupBox3.SuspendLayout()
+		Me.PnTC.SuspendLayout()
+		Me.GroupBox4.SuspendLayout()
+		Me.PnInertiaTI.SuspendLayout()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.SuspendLayout()
+		'
+		'ToolStrip1
+		'
+		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+		Me.ToolStrip1.Name = "ToolStrip1"
+		Me.ToolStrip1.Size = New System.Drawing.Size(877, 25)
+		Me.ToolStrip1.TabIndex = 30
+		Me.ToolStrip1.Text = "ToolStrip1"
+		'
+		'ToolStripBtNew
+		'
+		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
+		Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtNew.Name = "ToolStripBtNew"
+		Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtNew.Text = "ToolStripButton1"
+		Me.ToolStripBtNew.ToolTipText = "New"
+		'
+		'ToolStripBtOpen
+		'
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtOpen.Text = "ToolStripButton1"
+		Me.ToolStripBtOpen.ToolTipText = "Open..."
+		'
+		'ToolStripBtSave
+		'
+		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
+		Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSave.Name = "ToolStripBtSave"
+		Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSave.Text = "ToolStripButton1"
+		Me.ToolStripBtSave.ToolTipText = "Save"
+		'
+		'ToolStripBtSaveAs
+		'
+		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+		Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+		Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+		'
+		'ToolStripSeparator3
+		'
+		Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+		Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripBtSendTo
+		'
+		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
+		Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+		Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSendTo.Text = "Send to Job Editor"
+		Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
+		'
+		'ToolStripSeparator1
+		'
+		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripButton1
+		'
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton1.Name = "ToolStripButton1"
+		Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripButton1.Text = "Help"
+		'
+		'StatusStrip1
+		'
+		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 595)
+		Me.StatusStrip1.Name = "StatusStrip1"
+		Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
+		Me.StatusStrip1.SizingGrip = False
+		Me.StatusStrip1.TabIndex = 37
+		Me.StatusStrip1.Text = "StatusStrip1"
+		'
+		'LbStatus
+		'
+		Me.LbStatus.Name = "LbStatus"
+		Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+		Me.LbStatus.Text = "Status"
+		'
+		'ButCancel
+		'
+		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.ButCancel.Location = New System.Drawing.Point(790, 569)
+		Me.ButCancel.Name = "ButCancel"
+		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+		Me.ButCancel.TabIndex = 7
+		Me.ButCancel.Text = "Cancel"
+		Me.ButCancel.UseVisualStyleBackColor = True
+		'
+		'ButOK
+		'
+		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButOK.Location = New System.Drawing.Point(709, 569)
+		Me.ButOK.Name = "ButOK"
+		Me.ButOK.Size = New System.Drawing.Size(75, 23)
+		Me.ButOK.TabIndex = 6
+		Me.ButOK.Text = "Save"
+		Me.ButOK.UseVisualStyleBackColor = True
+		'
+		'TbTracInt
+		'
+		Me.TbTracInt.Location = New System.Drawing.Point(303, 3)
+		Me.TbTracInt.Name = "TbTracInt"
+		Me.TbTracInt.Size = New System.Drawing.Size(40, 20)
+		Me.TbTracInt.TabIndex = 1
+		'
+		'LvGears
+		'
+		Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader4, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6})
+		Me.LvGears.FullRowSelect = True
+		Me.LvGears.GridLines = True
+		Me.LvGears.HideSelection = False
+		Me.LvGears.Location = New System.Drawing.Point(6, 18)
+		Me.LvGears.MultiSelect = False
+		Me.LvGears.Name = "LvGears"
+		Me.LvGears.Size = New System.Drawing.Size(429, 183)
+		Me.LvGears.TabIndex = 0
+		Me.LvGears.TabStop = False
+		Me.LvGears.UseCompatibleStateImageBehavior = False
+		Me.LvGears.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader1
+		'
+		Me.ColumnHeader1.Text = "Gear"
+		Me.ColumnHeader1.Width = 40
+		'
+		'ColumnHeader4
+		'
+		Me.ColumnHeader4.Text = "TC"
+		Me.ColumnHeader4.Width = 31
+		'
+		'ColumnHeader2
+		'
+		Me.ColumnHeader2.Text = "Ratio"
+		Me.ColumnHeader2.Width = 43
+		'
+		'ColumnHeader3
+		'
+		Me.ColumnHeader3.Text = "Loss Map or Efficiency [-]"
+		Me.ColumnHeader3.Width = 137
+		'
+		'ColumnHeader5
+		'
+		Me.ColumnHeader5.Text = "Shift Polygons"
+		Me.ColumnHeader5.Width = 97
+		'
+		'ColumnHeader6
+		'
+		Me.ColumnHeader6.Text = "Full Load Curve"
+		Me.ColumnHeader6.Width = 89
+		'
+		'TBI_getr
+		'
+		Me.TBI_getr.Location = New System.Drawing.Point(53, 3)
+		Me.TBI_getr.Name = "TBI_getr"
+		Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
+		Me.TBI_getr.TabIndex = 0
+		'
+		'Label49
+		'
+		Me.Label49.AutoSize = True
+		Me.Label49.Location = New System.Drawing.Point(349, 6)
+		Me.Label49.Name = "Label49"
+		Me.Label49.Size = New System.Drawing.Size(18, 13)
+		Me.Label49.TabIndex = 2
+		Me.Label49.Text = "[s]"
+		'
+		'Label33
+		'
+		Me.Label33.AutoSize = True
+		Me.Label33.Location = New System.Drawing.Point(116, 6)
+		Me.Label33.Name = "Label33"
+		Me.Label33.Size = New System.Drawing.Size(36, 13)
+		Me.Label33.TabIndex = 2
+		Me.Label33.Text = "[kgm²]"
+		'
+		'Label48
+		'
+		Me.Label48.AutoSize = True
+		Me.Label48.Location = New System.Drawing.Point(195, 6)
+		Me.Label48.Name = "Label48"
+		Me.Label48.Size = New System.Drawing.Size(102, 13)
+		Me.Label48.TabIndex = 2
+		Me.Label48.Text = "Traction Interruption"
+		'
+		'Label6
+		'
+		Me.Label6.AutoSize = True
+		Me.Label6.Location = New System.Drawing.Point(11, 6)
+		Me.Label6.Name = "Label6"
+		Me.Label6.Size = New System.Drawing.Size(36, 13)
+		Me.Label6.TabIndex = 2
+		Me.Label6.Text = "Inertia"
+		'
+		'Label3
+		'
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(26, 85)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(87, 13)
+		Me.Label3.TabIndex = 42
+		Me.Label3.Text = "Make and Model"
+		'
+		'TbName
+		'
+		Me.TbName.Location = New System.Drawing.Point(119, 82)
+		Me.TbName.Name = "TbName"
+		Me.TbName.Size = New System.Drawing.Size(334, 20)
+		Me.TbName.TabIndex = 0
+		'
+		'PictureBox1
+		'
+		Me.PictureBox1.BackColor = System.Drawing.Color.White
+		Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_GBX
+		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
+		Me.PictureBox1.Name = "PictureBox1"
+		Me.PictureBox1.Size = New System.Drawing.Size(441, 40)
+		Me.PictureBox1.TabIndex = 43
+		Me.PictureBox1.TabStop = False
+		'
+		'BtRemGear
+		'
+		Me.BtRemGear.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtRemGear.Location = New System.Drawing.Point(41, 207)
+		Me.BtRemGear.Name = "BtRemGear"
+		Me.BtRemGear.Size = New System.Drawing.Size(29, 23)
+		Me.BtRemGear.TabIndex = 2
+		Me.BtRemGear.UseVisualStyleBackColor = True
+		'
+		'GrGearShift
+		'
+		Me.GrGearShift.Controls.Add(Me.PnTorqRes)
+		Me.GrGearShift.Controls.Add(Me.ChShiftInside)
+		Me.GrGearShift.Controls.Add(Me.TbShiftTime)
+		Me.GrGearShift.Controls.Add(Me.Label12)
+		Me.GrGearShift.Controls.Add(Me.Label13)
+		Me.GrGearShift.Controls.Add(Me.ChSkipGears)
+		Me.GrGearShift.Controls.Add(Me.GroupBox2)
+		Me.GrGearShift.Location = New System.Drawing.Point(12, 377)
+		Me.GrGearShift.Name = "GrGearShift"
+		Me.GrGearShift.Size = New System.Drawing.Size(441, 182)
+		Me.GrGearShift.TabIndex = 3
+		Me.GrGearShift.TabStop = False
+		Me.GrGearShift.Text = "Gear shift parameters"
+		'
+		'PnTorqRes
+		'
+		Me.PnTorqRes.Controls.Add(Me.Label2)
+		Me.PnTorqRes.Controls.Add(Me.Label4)
+		Me.PnTorqRes.Controls.Add(Me.TbTqResv)
+		Me.PnTorqRes.Location = New System.Drawing.Point(230, 19)
+		Me.PnTorqRes.Name = "PnTorqRes"
+		Me.PnTorqRes.Size = New System.Drawing.Size(190, 32)
+		Me.PnTorqRes.TabIndex = 2
+		'
+		'Label2
+		'
+		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(10, 9)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(79, 13)
+		Me.Label2.TabIndex = 0
+		Me.Label2.Text = "Torque reserve"
+		'
+		'Label4
+		'
+		Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(158, 9)
+		Me.Label4.Name = "Label4"
+		Me.Label4.Size = New System.Drawing.Size(21, 13)
+		Me.Label4.TabIndex = 0
+		Me.Label4.Text = "[%]"
+		'
+		'TbTqResv
+		'
+		Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbTqResv.Location = New System.Drawing.Point(95, 6)
+		Me.TbTqResv.Name = "TbTqResv"
+		Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
+		Me.TbTqResv.TabIndex = 0
+		'
+		'ChShiftInside
+		'
+		Me.ChShiftInside.AutoSize = True
+		Me.ChShiftInside.Checked = True
+		Me.ChShiftInside.CheckState = System.Windows.Forms.CheckState.Checked
+		Me.ChShiftInside.Location = New System.Drawing.Point(9, 27)
+		Me.ChShiftInside.Name = "ChShiftInside"
+		Me.ChShiftInside.Size = New System.Drawing.Size(195, 17)
+		Me.ChShiftInside.TabIndex = 0
+		Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT)"
+		Me.ChShiftInside.UseVisualStyleBackColor = True
+		'
+		'TbShiftTime
+		'
+		Me.TbShiftTime.Location = New System.Drawing.Point(325, 51)
+		Me.TbShiftTime.Name = "TbShiftTime"
+		Me.TbShiftTime.Size = New System.Drawing.Size(57, 20)
+		Me.TbShiftTime.TabIndex = 3
+		'
+		'Label12
+		'
+		Me.Label12.AutoSize = True
+		Me.Label12.Location = New System.Drawing.Point(388, 54)
+		Me.Label12.Name = "Label12"
+		Me.Label12.Size = New System.Drawing.Size(18, 13)
+		Me.Label12.TabIndex = 9
+		Me.Label12.Text = "[s]"
+		'
+		'Label13
+		'
+		Me.Label13.AutoSize = True
+		Me.Label13.Location = New System.Drawing.Point(227, 54)
+		Me.Label13.Name = "Label13"
+		Me.Label13.Size = New System.Drawing.Size(92, 13)
+		Me.Label13.TabIndex = 8
+		Me.Label13.Text = "Minimum shift time"
+		'
+		'ChSkipGears
+		'
+		Me.ChSkipGears.AutoSize = True
+		Me.ChSkipGears.Location = New System.Drawing.Point(9, 53)
+		Me.ChSkipGears.Name = "ChSkipGears"
+		Me.ChSkipGears.Size = New System.Drawing.Size(132, 17)
+		Me.ChSkipGears.TabIndex = 1
+		Me.ChSkipGears.Text = "Skip Gears (MT, AMT)"
+		Me.ChSkipGears.UseVisualStyleBackColor = True
+		'
+		'GroupBox2
+		'
+		Me.GroupBox2.Controls.Add(Me.TbStartAcc)
+		Me.GroupBox2.Controls.Add(Me.Label11)
+		Me.GroupBox2.Controls.Add(Me.TbStartSpeed)
+		Me.GroupBox2.Controls.Add(Me.Label9)
+		Me.GroupBox2.Controls.Add(Me.Label10)
+		Me.GroupBox2.Controls.Add(Me.TbTqResvStart)
+		Me.GroupBox2.Controls.Add(Me.Label8)
+		Me.GroupBox2.Controls.Add(Me.Label5)
+		Me.GroupBox2.Controls.Add(Me.Label7)
+		Me.GroupBox2.Location = New System.Drawing.Point(6, 77)
+		Me.GroupBox2.Name = "GroupBox2"
+		Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
+		Me.GroupBox2.TabIndex = 4
+		Me.GroupBox2.TabStop = False
+		Me.GroupBox2.Text = "Start Gear"
+		'
+		'TbStartAcc
+		'
+		Me.TbStartAcc.Location = New System.Drawing.Point(209, 71)
+		Me.TbStartAcc.Name = "TbStartAcc"
+		Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
+		Me.TbStartAcc.TabIndex = 2
+		'
+		'Label11
+		'
+		Me.Label11.AutoSize = True
+		Me.Label11.Location = New System.Drawing.Point(20, 74)
+		Me.Label11.Name = "Label11"
+		Me.Label11.Size = New System.Drawing.Size(173, 13)
+		Me.Label11.TabIndex = 0
+		Me.Label11.Text = "Reference acceleration at clutch-in"
+		'
+		'TbStartSpeed
+		'
+		Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45)
+		Me.TbStartSpeed.Name = "TbStartSpeed"
+		Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20)
+		Me.TbStartSpeed.TabIndex = 1
+		'
+		'Label9
+		'
+		Me.Label9.AutoSize = True
+		Me.Label9.Location = New System.Drawing.Point(20, 48)
+		Me.Label9.Name = "Label9"
+		Me.Label9.Size = New System.Drawing.Size(181, 13)
+		Me.Label9.TabIndex = 0
+		Me.Label9.Text = "Reference vehicle speed at clutch-in"
+		'
+		'Label10
+		'
+		Me.Label10.AutoSize = True
+		Me.Label10.Location = New System.Drawing.Point(272, 74)
+		Me.Label10.Name = "Label10"
+		Me.Label10.Size = New System.Drawing.Size(34, 13)
+		Me.Label10.TabIndex = 0
+		Me.Label10.Text = "[m/s²]"
+		'
+		'TbTqResvStart
+		'
+		Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19)
+		Me.TbTqResvStart.Name = "TbTqResvStart"
+		Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20)
+		Me.TbTqResvStart.TabIndex = 0
+		'
+		'Label8
+		'
+		Me.Label8.AutoSize = True
+		Me.Label8.Location = New System.Drawing.Point(272, 48)
+		Me.Label8.Name = "Label8"
+		Me.Label8.Size = New System.Drawing.Size(31, 13)
+		Me.Label8.TabIndex = 0
+		Me.Label8.Text = "[m/s]"
+		'
+		'Label5
+		'
+		Me.Label5.AutoSize = True
+		Me.Label5.Location = New System.Drawing.Point(20, 22)
+		Me.Label5.Name = "Label5"
+		Me.Label5.Size = New System.Drawing.Size(79, 13)
+		Me.Label5.TabIndex = 0
+		Me.Label5.Text = "Torque reserve"
+		'
+		'Label7
+		'
+		Me.Label7.AutoSize = True
+		Me.Label7.Location = New System.Drawing.Point(272, 22)
+		Me.Label7.Name = "Label7"
+		Me.Label7.Size = New System.Drawing.Size(21, 13)
+		Me.Label7.TabIndex = 0
+		Me.Label7.Text = "[%]"
+		'
+		'CmOpenFile
+		'
+		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+		Me.CmOpenFile.Name = "CmOpenFile"
+		Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+		'
+		'OpenWithToolStripMenuItem
+		'
+		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+		'
+		'ShowInFolderToolStripMenuItem
+		'
+		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+		'
+		'GroupBox3
+		'
+		Me.GroupBox3.Controls.Add(Me.PnTC)
+		Me.GroupBox3.Controls.Add(Me.ChTCon)
+		Me.GroupBox3.Location = New System.Drawing.Point(459, 440)
+		Me.GroupBox3.Name = "GroupBox3"
+		Me.GroupBox3.Size = New System.Drawing.Size(414, 119)
+		Me.GroupBox3.TabIndex = 5
+		Me.GroupBox3.TabStop = False
+		Me.GroupBox3.Text = "Torque Converter"
+		'
+		'PnTC
+		'
+		Me.PnTC.Controls.Add(Me.Label17)
+		Me.PnTC.Controls.Add(Me.Label18)
+		Me.PnTC.Controls.Add(Me.Label15)
+		Me.PnTC.Controls.Add(Me.TbTCinertia)
+		Me.PnTC.Controls.Add(Me.Label1)
+		Me.PnTC.Controls.Add(Me.Label14)
+		Me.PnTC.Controls.Add(Me.BtTCfileBrowse)
+		Me.PnTC.Controls.Add(Me.TbTCfile)
+		Me.PnTC.Controls.Add(Me.BtTCfileOpen)
+		Me.PnTC.Controls.Add(Me.TbTCrefrpm)
+		Me.PnTC.Location = New System.Drawing.Point(6, 39)
+		Me.PnTC.Name = "PnTC"
+		Me.PnTC.Size = New System.Drawing.Size(402, 72)
+		Me.PnTC.TabIndex = 36
+		'
+		'Label17
+		'
+		Me.Label17.AutoSize = True
+		Me.Label17.Location = New System.Drawing.Point(0, 5)
+		Me.Label17.Name = "Label17"
+		Me.Label17.Size = New System.Drawing.Size(176, 13)
+		Me.Label17.TabIndex = 0
+		Me.Label17.Text = "Torque converter characteristics file"
+		'
+		'Label18
+		'
+		Me.Label18.AutoSize = True
+		Me.Label18.Location = New System.Drawing.Point(5, 50)
+		Me.Label18.Name = "Label18"
+		Me.Label18.Size = New System.Drawing.Size(36, 13)
+		Me.Label18.TabIndex = 2
+		Me.Label18.Text = "Inertia"
+		'
+		'Label15
+		'
+		Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label15.AutoSize = True
+		Me.Label15.Location = New System.Drawing.Point(185, 50)
+		Me.Label15.Name = "Label15"
+		Me.Label15.Size = New System.Drawing.Size(77, 13)
+		Me.Label15.TabIndex = 0
+		Me.Label15.Text = "Reference rpm"
+		'
+		'TbTCinertia
+		'
+		Me.TbTCinertia.Location = New System.Drawing.Point(47, 47)
+		Me.TbTCinertia.Name = "TbTCinertia"
+		Me.TbTCinertia.Size = New System.Drawing.Size(67, 20)
+		Me.TbTCinertia.TabIndex = 3
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(120, 50)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(36, 13)
+		Me.Label1.TabIndex = 2
+		Me.Label1.Text = "[kgm²]"
+		'
+		'Label14
+		'
+		Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label14.AutoSize = True
+		Me.Label14.Location = New System.Drawing.Point(341, 50)
+		Me.Label14.Name = "Label14"
+		Me.Label14.Size = New System.Drawing.Size(40, 13)
+		Me.Label14.TabIndex = 0
+		Me.Label14.Text = "[1/min]"
+		'
+		'BtTCfileBrowse
+		'
+		Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtTCfileBrowse.Location = New System.Drawing.Point(341, 19)
+		Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
+		Me.BtTCfileBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtTCfileBrowse.TabIndex = 1
+		Me.BtTCfileBrowse.TabStop = False
+		Me.BtTCfileBrowse.Text = "..."
+		Me.BtTCfileBrowse.UseVisualStyleBackColor = True
+		'
+		'TbTCfile
+		'
+		Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbTCfile.Location = New System.Drawing.Point(0, 21)
+		Me.TbTCfile.Name = "TbTCfile"
+		Me.TbTCfile.Size = New System.Drawing.Size(335, 20)
+		Me.TbTCfile.TabIndex = 0
+		'
+		'BtTCfileOpen
+		'
+		Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtTCfileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+		Me.BtTCfileOpen.Location = New System.Drawing.Point(379, 19)
+		Me.BtTCfileOpen.Name = "BtTCfileOpen"
+		Me.BtTCfileOpen.Size = New System.Drawing.Size(23, 23)
+		Me.BtTCfileOpen.TabIndex = 2
+		Me.BtTCfileOpen.TabStop = False
+		Me.BtTCfileOpen.UseVisualStyleBackColor = True
+		'
+		'TbTCrefrpm
+		'
+		Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbTCrefrpm.Location = New System.Drawing.Point(268, 47)
+		Me.TbTCrefrpm.Name = "TbTCrefrpm"
+		Me.TbTCrefrpm.Size = New System.Drawing.Size(67, 20)
+		Me.TbTCrefrpm.TabIndex = 4
+		'
+		'ChTCon
+		'
+		Me.ChTCon.AutoSize = True
+		Me.ChTCon.Checked = True
+		Me.ChTCon.CheckState = System.Windows.Forms.CheckState.Checked
+		Me.ChTCon.Location = New System.Drawing.Point(9, 19)
+		Me.ChTCon.Name = "ChTCon"
+		Me.ChTCon.Size = New System.Drawing.Size(88, 17)
+		Me.ChTCon.TabIndex = 0
+		Me.ChTCon.Text = "Installed (AT)"
+		Me.ChTCon.UseVisualStyleBackColor = True
+		'
+		'Label16
+		'
+		Me.Label16.AutoSize = True
+		Me.Label16.Location = New System.Drawing.Point(18, 111)
+		Me.Label16.Name = "Label16"
+		Me.Label16.Size = New System.Drawing.Size(95, 13)
+		Me.Label16.TabIndex = 45
+		Me.Label16.Text = "Transmission Type"
+		'
+		'CbGStype
+		'
+		Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+		Me.CbGStype.FormattingEnabled = True
+		Me.CbGStype.Location = New System.Drawing.Point(119, 108)
+		Me.CbGStype.Name = "CbGStype"
+		Me.CbGStype.Size = New System.Drawing.Size(227, 21)
+		Me.CbGStype.TabIndex = 1
+		'
+		'BtAddGear
+		'
+		Me.BtAddGear.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtAddGear.Location = New System.Drawing.Point(6, 207)
+		Me.BtAddGear.Name = "BtAddGear"
+		Me.BtAddGear.Size = New System.Drawing.Size(29, 23)
+		Me.BtAddGear.TabIndex = 1
+		Me.BtAddGear.UseVisualStyleBackColor = True
+		'
+		'GroupBox4
+		'
+		Me.GroupBox4.Controls.Add(Me.Label32)
+		Me.GroupBox4.Controls.Add(Me.LvGears)
+		Me.GroupBox4.Controls.Add(Me.BtRemGear)
+		Me.GroupBox4.Controls.Add(Me.BtAddGear)
+		Me.GroupBox4.Location = New System.Drawing.Point(12, 135)
+		Me.GroupBox4.Name = "GroupBox4"
+		Me.GroupBox4.Size = New System.Drawing.Size(441, 236)
+		Me.GroupBox4.TabIndex = 2
+		Me.GroupBox4.TabStop = False
+		Me.GroupBox4.Text = "Gears"
+		'
+		'Label32
+		'
+		Me.Label32.AutoSize = True
+		Me.Label32.Location = New System.Drawing.Point(312, 212)
+		Me.Label32.Name = "Label32"
+		Me.Label32.Size = New System.Drawing.Size(123, 13)
+		Me.Label32.TabIndex = 3
+		Me.Label32.Text = "Double-Click to edit gear"
+		'
+		'PnInertiaTI
+		'
+		Me.PnInertiaTI.Controls.Add(Me.Label6)
+		Me.PnInertiaTI.Controls.Add(Me.TBI_getr)
+		Me.PnInertiaTI.Controls.Add(Me.Label33)
+		Me.PnInertiaTI.Controls.Add(Me.Label48)
+		Me.PnInertiaTI.Controls.Add(Me.Label49)
+		Me.PnInertiaTI.Controls.Add(Me.TbTracInt)
+		Me.PnInertiaTI.Location = New System.Drawing.Point(469, 406)
+		Me.PnInertiaTI.Name = "PnInertiaTI"
+		Me.PnInertiaTI.Size = New System.Drawing.Size(398, 30)
+		Me.PnInertiaTI.TabIndex = 4
+		'
+		'PicBox
+		'
+		Me.PicBox.BackColor = System.Drawing.Color.LightGray
+		Me.PicBox.Location = New System.Drawing.Point(459, 28)
+		Me.PicBox.Name = "PicBox"
+		Me.PicBox.Size = New System.Drawing.Size(406, 372)
+		Me.PicBox.TabIndex = 48
+		Me.PicBox.TabStop = False
+		'
+		'F_GBX
+		'
+		Me.AcceptButton = Me.ButOK
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.ButCancel
+		Me.ClientSize = New System.Drawing.Size(877, 617)
+		Me.Controls.Add(Me.PicBox)
+		Me.Controls.Add(Me.PnInertiaTI)
+		Me.Controls.Add(Me.GroupBox4)
+		Me.Controls.Add(Me.CbGStype)
+		Me.Controls.Add(Me.Label16)
+		Me.Controls.Add(Me.PictureBox1)
+		Me.Controls.Add(Me.GrGearShift)
+		Me.Controls.Add(Me.GroupBox3)
+		Me.Controls.Add(Me.Label3)
+		Me.Controls.Add(Me.TbName)
+		Me.Controls.Add(Me.ButCancel)
+		Me.Controls.Add(Me.ButOK)
+		Me.Controls.Add(Me.StatusStrip1)
+		Me.Controls.Add(Me.ToolStrip1)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MaximizeBox = False
+		Me.Name = "F_GBX"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "F_GBX"
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.GrGearShift.ResumeLayout(False)
+		Me.GrGearShift.PerformLayout()
+		Me.PnTorqRes.ResumeLayout(False)
+		Me.PnTorqRes.PerformLayout()
+		Me.GroupBox2.ResumeLayout(False)
+		Me.GroupBox2.PerformLayout()
+		Me.CmOpenFile.ResumeLayout(False)
+		Me.GroupBox3.ResumeLayout(False)
+		Me.GroupBox3.PerformLayout()
+		Me.PnTC.ResumeLayout(False)
+		Me.PnTC.PerformLayout()
+		Me.GroupBox4.ResumeLayout(False)
+		Me.GroupBox4.PerformLayout()
+		Me.PnInertiaTI.ResumeLayout(False)
+		Me.PnInertiaTI.PerformLayout()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-    End Sub
+	End Sub
     Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
     Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
@@ -900,5 +906,6 @@ Partial Class F_GBX
     Friend WithEvents PicBox As System.Windows.Forms.PictureBox
     Friend WithEvents TbTCinertia As System.Windows.Forms.TextBox
     Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents Label18 As System.Windows.Forms.Label
+	Friend WithEvents Label18 As System.Windows.Forms.Label
+	Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader
 End Class
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index 982abef75373a1dad027b5b77796c7d668ccc293..47e8d747b0a6e4813ff776e8acb8f18c3f2dba06 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -16,8 +16,8 @@ Imports System.Collections.Generic
 ''' <remarks></remarks>
 Public Class F_GBX
 
-    Private GbxFile As String = ""
-    Public AutoSendTo As Boolean = False
+	Private GbxFile As String = ""
+	Public AutoSendTo As Boolean = False
     Public JobDir As String = ""
     Private GearDia As F_GBX_GearDlog
 
@@ -156,7 +156,8 @@ Public Class F_GBX
         lvi.SubItems.Add("-")
         lvi.SubItems.Add("0")
         lvi.SubItems.Add("0")
-        lvi.SubItems.Add("")
+		lvi.SubItems.Add("")
+		lvi.SubItems.Add("")
         Me.LvGears.Items.Add(lvi)
 
         'Me.ChSkipGears.Checked = False         'set by CbGStype.SelectedIndexChanged
@@ -240,7 +241,8 @@ Public Class F_GBX
             End If
             lv0.SubItems.Add(GBX0.Igetr(i))
             lv0.SubItems.Add(GBX0.GetrMap(i, True))
-            lv0.SubItems.Add(GBX0.gsFile(i, True))
+			lv0.SubItems.Add(GBX0.gsFile(i, True))
+			lv0.SubItems.Add(GBX0.FldFile(i, True))
 
             Me.LvGears.Items.Add(lv0)
         Next
@@ -309,7 +311,9 @@ Public Class F_GBX
             GBX0.GetrMaps.Add(New cSubPath)
             GBX0.GetrMap(i) = Me.LvGears.Items(i).SubItems(3).Text
             GBX0.gs_files.Add(New cSubPath)
-            GBX0.gsFile(i) = Me.LvGears.Items(i).SubItems(4).Text
+			GBX0.gsFile(i) = Me.LvGears.Items(i).SubItems(4).Text
+			GBX0.FldFiles.Add(New cSubPath)
+			GBX0.FldFile(i) = Me.LvGears.Items(i).SubItems(5).Text
         Next
 
         GBX0.gs_TorqueResv = fTextboxToNumString(Me.TbTqResv.Text)
@@ -519,18 +523,21 @@ Public Class F_GBX
         Do
 
             GearDia.ChIsTCgear.Enabled = (Me.ChTCon.Checked And Me.LvGears.SelectedIndices(0) > 0)
-            GearDia.PnShiftPoly.Enabled = (Not Cfg.DeclMode And Me.LvGears.SelectedIndices(0) > 0)
+			GearDia.PnShiftPoly.Enabled = (Not Cfg.DeclMode And Me.LvGears.SelectedIndices(0) > 0)
+			GearDia.PnFld.Enabled = (Me.LvGears.SelectedIndices(0) > 0)
             GearDia.GbxPath = fPATH(GbxFile)
-            GearDia.TbGear.Text = Me.LvGears.SelectedItems(0).SubItems(0).Text
+			GearDia.TbGear.Text = Me.LvGears.SelectedItems(0).SubItems(0).Text
             GearDia.TbRatio.Text = Me.LvGears.SelectedItems(0).SubItems(2).Text
             GearDia.TbMapPath.Text = Me.LvGears.SelectedItems(0).SubItems(3).Text
             If Me.LvGears.SelectedIndices(0) > 0 Then
                 GearDia.ChIsTCgear.Checked = (Me.ChTCon.Checked And Me.LvGears.SelectedItems(0).SubItems(1).Text = "on")
                 GearDia.TbShiftPolyFile.Text = Me.LvGears.SelectedItems(0).SubItems(4).Text
-            Else
-                GearDia.ChIsTCgear.Checked = False
-                GearDia.TbShiftPolyFile.Text = ""
-            End If
+				GearDia.TbFld.Text = Me.LvGears.SelectedItems(0).SubItems(5).Text
+			Else
+				GearDia.ChIsTCgear.Checked = False
+				GearDia.TbShiftPolyFile.Text = ""
+				GearDia.TbFld.Text = ""
+			End If
 
             If GearDia.ShowDialog = Windows.Forms.DialogResult.OK Then
 
@@ -546,7 +553,8 @@ Public Class F_GBX
 
                 Me.LvGears.SelectedItems(0).SubItems(2).Text = GearDia.TbRatio.Text
                 Me.LvGears.SelectedItems(0).SubItems(3).Text = GearDia.TbMapPath.Text
-                Me.LvGears.SelectedItems(0).SubItems(4).Text = GearDia.TbShiftPolyFile.Text
+				Me.LvGears.SelectedItems(0).SubItems(4).Text = GearDia.TbShiftPolyFile.Text
+				Me.LvGears.SelectedItems(0).SubItems(5).Text = GearDia.TbFld.Text
 
                 UpdatePic()
                 Change()
@@ -579,7 +587,8 @@ Public Class F_GBX
         End If
         lvi.SubItems.Add("")
         lvi.SubItems.Add("")
-        lvi.SubItems.Add("")
+		lvi.SubItems.Add("")
+		lvi.SubItems.Add("")
         Me.LvGears.Items.Add(lvi)
 
         lvi.EnsureVisible()
@@ -668,36 +677,52 @@ Public Class F_GBX
 
         Dim f As cFile_V3 = Nothing
         Dim path As String
-        Dim lM As List(Of Single)
-        Dim lup As List(Of Single)
-        Dim ldown As List(Of Single)
+		Dim lM As List(Of Single) = Nothing
+		Dim lup As List(Of Single) = Nothing
+		Dim ldown As List(Of Single) = Nothing
         Dim line As String() = Nothing
         Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart
         Dim s As System.Windows.Forms.DataVisualization.Charting.Series
         Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea
         Dim img As Image
         Dim Gear As Integer
+		Dim fldOK As Boolean = False
+		Dim fldpath As String
+		Dim FLD0 As cFLD = Nothing
+		Dim ShiftOK As Boolean = False
+		Dim Shiftpoly As cGBX.cShiftPolygon
 
         Me.PicBox.Image = Nothing
 
         Try
 
-            'Read Files
+			'Check Files
             If Me.LvGears.Items.Count > 1 Then
 
-                If Me.LvGears.SelectedItems.Count > 0 Then
-                    path = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(4).Text, fPATH(GbxFile))
-                    Gear = Me.LvGears.SelectedIndices(0)
-                Else
-                    path = fFileRepl(Me.LvGears.Items(1).SubItems(4).Text, fPATH(GbxFile))
-                    Gear = 1
-                End If
+				If Me.LvGears.SelectedItems.Count > 0 AndAlso Me.LvGears.SelectedIndices(0) > 0 Then
+					path = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(4).Text, fPATH(GbxFile))
+					fldpath = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(5).Text, fPATH(GbxFile))
+					Gear = Me.LvGears.SelectedIndices(0)
+				Else
+					path = fFileRepl(Me.LvGears.Items(1).SubItems(4).Text, fPATH(GbxFile))
+					fldpath = fFileRepl(Me.LvGears.Items(1).SubItems(5).Text, fPATH(GbxFile))
+					Gear = 1
+				End If
 
                 f = New cFile_V3
-                If Not f.OpenRead(path) Then Exit Sub
+				ShiftOK = f.OpenRead(path)
+
+				If fldpath.Trim = "" Then
+					If F_VECTO.Visible AndAlso F_VECTO.FLDfile <> "" Then fldpath = F_VECTO.FLDfile
+				End If
+
+				fldOK = fldpath.Trim <> ""
 
-                'Header
-                f.ReadLine()
+				If fldOK Then
+					FLD0 = New cFLD
+					FLD0.FilePath = fldpath
+					fldOK = FLD0.ReadFile(True, False)
+				End If
 
             Else
 
@@ -708,86 +733,144 @@ Public Class F_GBX
         Catch ex As Exception
             Exit Sub
 
-        End Try
+		End Try
 
-        Try
-            lM = New List(Of Single)
-            lup = New List(Of Single)
-            ldown = New List(Of Single)
+		'Read ShiftPolygon
+		If ShiftOK Then
 
-            Do While Not f.EndOfFile
-                line = f.ReadLine
-                lM.Add(CSng(line(0)))
-                lup.Add(CSng(line(1)))
-                ldown.Add(CSng(line(2)))
-            Loop
+			'Header
+			f.ReadLine()
 
-            f.Close()
+			Try
+				lM = New List(Of Single)
+				lup = New List(Of Single)
+				ldown = New List(Of Single)
 
-        Catch ex As Exception
-            f.Close()
-            Exit Sub
-        End Try
+				Do While Not f.EndOfFile
+					line = f.ReadLine
+					lM.Add(CSng(line(0)))
+					lup.Add(CSng(line(1)))
+					ldown.Add(CSng(line(2)))
+				Loop
 
-        If lM.Count < 2 Then Exit Sub
+				f.Close()
 
-        'Create plot
-        MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart
-        MyChart.Width = Me.PicBox.Width
-        MyChart.Height = Me.PicBox.Height
+			Catch ex As Exception
+				f.Close()
+				Exit Sub
+			End Try
 
-        a = New System.Windows.Forms.DataVisualization.Charting.ChartArea
+			If lM.Count < 2 Then ShiftOK = False
 
-        s = New System.Windows.Forms.DataVisualization.Charting.Series
-        s.Points.DataBindXY(lup, lM)
-        s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-        s.BorderWidth = 2
-        s.Color = Color.DarkRed
-        s.Name = "Upshift curve"
-        MyChart.Series.Add(s)
+		End If
 
-        s = New System.Windows.Forms.DataVisualization.Charting.Series
-        s.Points.DataBindXY(ldown, lM)
-        s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-        s.BorderWidth = 2
-        s.Color = Color.DarkRed
-        s.Name = "Downshift curve"
-        MyChart.Series.Add(s)
 
-        a.Name = "main"
 
-        a.AxisX.Title = "engine speed [1/min]"
-        a.AxisX.TitleFont = New Font("Helvetica", 10)
-        a.AxisX.LabelStyle.Font = New Font("Helvetica", 8)
-        a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
-        a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+		'Create plot
+		If Not ShiftOK And Not fldOK Then Exit Sub
 
-        a.AxisY.Title = "engine torque [Nm]"
-        a.AxisY.TitleFont = New Font("Helvetica", 10)
-        a.AxisY.LabelStyle.Font = New Font("Helvetica", 8)
-        a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
-        a.AxisY.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+		MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart
+		MyChart.Width = Me.PicBox.Width
+		MyChart.Height = Me.PicBox.Height
 
-        a.AxisX.Minimum = 300
-        a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid
-        a.BorderWidth = 1
+		a = New System.Windows.Forms.DataVisualization.Charting.ChartArea
 
-        a.BackColor = Color.GhostWhite
+		'Shiftpolygons from file
+		If ShiftOK Then
+			s = New System.Windows.Forms.DataVisualization.Charting.Series
+			s.Points.DataBindXY(lup, lM)
+			s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+			s.BorderWidth = 2
+			s.Color = Color.DarkRed
+			s.Name = "Upshift curve"
+			MyChart.Series.Add(s)
 
-        MyChart.ChartAreas.Add(a)
+			s = New System.Windows.Forms.DataVisualization.Charting.Series
+			s.Points.DataBindXY(ldown, lM)
+			s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+			s.BorderWidth = 2
+			s.Color = Color.DarkRed
+			s.Name = "Downshift curve"
+			MyChart.Series.Add(s)
+		End If
 
-        MyChart.Titles.Add("Gear " & Gear & " shift polygons")
-        MyChart.Titles(0).Font = New Font("Helvetica", 12)
+		'Fld
+		If fldOK Then
 
-        MyChart.Update()
+			s = New System.Windows.Forms.DataVisualization.Charting.Series
+			s.Points.DataBindXY(FLD0.LnU, FLD0.LTq)
+			s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+			s.BorderWidth = 2
+			s.Color = Color.DarkBlue
+			s.Name = "Full load"
+			MyChart.Series.Add(s)
 
-        img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb)
-        MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height))
+			If F_VECTO.Visible AndAlso F_VECTO.n_idle > 0 Then
+				If FLD0.Init(F_VECTO.n_idle) Then
 
-        Me.PicBox.Image = img
+					Shiftpoly = New cGBX.cShiftPolygon("", 0)
+					Shiftpoly.SetGenericShiftPoly(FLD0, F_VECTO.n_idle)
 
+					s = New System.Windows.Forms.DataVisualization.Charting.Series
+					s.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp)
+					s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+					s.BorderWidth = 2
+					s.Color = Color.DarkRed
+					s.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Dash
+					s.Name = "Upshift curve (generic)"
+					MyChart.Series.Add(s)
 
-    End Sub
+					s = New System.Windows.Forms.DataVisualization.Charting.Series
+					s.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown)
+					s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+					s.BorderWidth = 2
+					s.Color = Color.DarkRed
+					s.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Dash
+					s.Name = "Downshift curve (generic)"
+					MyChart.Series.Add(s)
+
+				End If
+			End If
+
+		End If
+
+
+
+
+		a.Name = "main"
+
+		a.AxisX.Title = "engine speed [1/min]"
+		a.AxisX.TitleFont = New Font("Helvetica", 10)
+		a.AxisX.LabelStyle.Font = New Font("Helvetica", 8)
+		a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
+		a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+
+		a.AxisY.Title = "engine torque [Nm]"
+		a.AxisY.TitleFont = New Font("Helvetica", 10)
+		a.AxisY.LabelStyle.Font = New Font("Helvetica", 8)
+		a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
+		a.AxisY.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+
+		a.AxisX.Minimum = 300
+		a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid
+		a.BorderWidth = 1
+
+		a.BackColor = Color.GhostWhite
+
+		MyChart.ChartAreas.Add(a)
+
+		MyChart.Titles.Add("Gear " & Gear & " shift polygons")
+		MyChart.Titles(0).Font = New Font("Helvetica", 12)
+
+		MyChart.Update()
+
+		img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb)
+		MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height))
+
+		Me.PicBox.Image = img
+
+
+	End Sub
 
 
 
diff --git a/VECTO/GUI/F_GBX_GearDlog.Designer.vb b/VECTO/GUI/F_GBX_GearDlog.Designer.vb
index 12eb5b715cbccddfdad42e5b3909cb6574a5657b..d8509838d84843bf18ce80dcdb72b58427f8d857 100644
--- a/VECTO/GUI/F_GBX_GearDlog.Designer.vb
+++ b/VECTO/GUI/F_GBX_GearDlog.Designer.vb
@@ -22,224 +22,284 @@ Partial Class F_GBX_GearDlog
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-        Me.OK_Button = New System.Windows.Forms.Button()
-        Me.Cancel_Button = New System.Windows.Forms.Button()
-        Me.TbGear = New System.Windows.Forms.TextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.TbRatio = New System.Windows.Forms.TextBox()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.TbMapPath = New System.Windows.Forms.TextBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.BtBrowse = New System.Windows.Forms.Button()
-        Me.BtNext = New System.Windows.Forms.Button()
-        Me.ChIsTCgear = New System.Windows.Forms.CheckBox()
-        Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
-        Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.PnShiftPoly = New System.Windows.Forms.Panel()
-        Me.TableLayoutPanel1.SuspendLayout()
-        Me.PnShiftPoly.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'TableLayoutPanel1
-        '
-        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TableLayoutPanel1.ColumnCount = 2
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
-        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(380, 146)
-        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-        Me.TableLayoutPanel1.RowCount = 1
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
-        Me.TableLayoutPanel1.TabIndex = 0
-        '
-        'OK_Button
-        '
-        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
-        Me.OK_Button.Name = "OK_Button"
-        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
-        Me.OK_Button.Text = "OK"
-        '
-        'Cancel_Button
-        '
-        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
-        Me.Cancel_Button.Name = "Cancel_Button"
-        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
-        Me.Cancel_Button.Text = "Cancel"
-        '
-        'TbGear
-        '
-        Me.TbGear.Location = New System.Drawing.Point(48, 6)
-        Me.TbGear.Name = "TbGear"
-        Me.TbGear.ReadOnly = True
-        Me.TbGear.Size = New System.Drawing.Size(37, 20)
-        Me.TbGear.TabIndex = 1
-        Me.TbGear.TabStop = False
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 9)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(30, 13)
-        Me.Label1.TabIndex = 2
-        Me.Label1.Text = "Gear"
-        '
-        'TbRatio
-        '
-        Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbRatio.Location = New System.Drawing.Point(149, 6)
-        Me.TbRatio.Name = "TbRatio"
-        Me.TbRatio.Size = New System.Drawing.Size(66, 20)
-        Me.TbRatio.TabIndex = 3
-        '
-        'Label2
-        '
-        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(111, 9)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(32, 13)
-        Me.Label2.TabIndex = 4
-        Me.Label2.Text = "Ratio"
-        '
-        'TbMapPath
-        '
-        Me.TbMapPath.Location = New System.Drawing.Point(12, 61)
-        Me.TbMapPath.Name = "TbMapPath"
-        Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
-        Me.TbMapPath.TabIndex = 5
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(12, 45)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(126, 13)
-        Me.Label3.TabIndex = 7
-        Me.Label3.Text = "Loss Map or Efficiency [-]"
-        '
-        'BtBrowse
-        '
-        Me.BtBrowse.Location = New System.Drawing.Point(494, 59)
-        Me.BtBrowse.Name = "BtBrowse"
-        Me.BtBrowse.Size = New System.Drawing.Size(32, 23)
-        Me.BtBrowse.TabIndex = 8
-        Me.BtBrowse.Text = "..."
-        Me.BtBrowse.UseVisualStyleBackColor = True
-        '
-        'BtNext
-        '
-        Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtNext.Location = New System.Drawing.Point(307, 149)
-        Me.BtNext.Name = "BtNext"
-        Me.BtNext.Size = New System.Drawing.Size(67, 23)
-        Me.BtNext.TabIndex = 9
-        Me.BtNext.Text = "&Next"
-        Me.BtNext.UseVisualStyleBackColor = True
-        '
-        'ChIsTCgear
-        '
-        Me.ChIsTCgear.AutoSize = True
-        Me.ChIsTCgear.Location = New System.Drawing.Point(236, 8)
-        Me.ChIsTCgear.Name = "ChIsTCgear"
-        Me.ChIsTCgear.Size = New System.Drawing.Size(241, 17)
-        Me.ChIsTCgear.TabIndex = 10
-        Me.ChIsTCgear.Text = "Torque Conveter active (lock-up clutch open)"
-        Me.ChIsTCgear.UseVisualStyleBackColor = True
-        '
-        'TbShiftPolyFile
-        '
-        Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
-        Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
-        Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
-        Me.TbShiftPolyFile.TabIndex = 12
-        '
-        'BtShiftPolyBrowse
-        '
-        Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(484, 15)
-        Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
-        Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
-        Me.BtShiftPolyBrowse.TabIndex = 13
-        Me.BtShiftPolyBrowse.TabStop = False
-        Me.BtShiftPolyBrowse.Text = "..."
-        Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(2, 1)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(89, 13)
-        Me.Label4.TabIndex = 11
-        Me.Label4.Text = "Shift polygons file"
-        '
-        'PnShiftPoly
-        '
-        Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
-        Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
-        Me.PnShiftPoly.Controls.Add(Me.Label4)
-        Me.PnShiftPoly.Location = New System.Drawing.Point(10, 90)
-        Me.PnShiftPoly.Name = "PnShiftPoly"
-        Me.PnShiftPoly.Size = New System.Drawing.Size(525, 46)
-        Me.PnShiftPoly.TabIndex = 14
-        '
-        'F_GBX_GearDlog
-        '
-        Me.AcceptButton = Me.OK_Button
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.Cancel_Button
-        Me.ClientSize = New System.Drawing.Size(538, 187)
-        Me.Controls.Add(Me.PnShiftPoly)
-        Me.Controls.Add(Me.ChIsTCgear)
-        Me.Controls.Add(Me.BtNext)
-        Me.Controls.Add(Me.BtBrowse)
-        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.TbMapPath)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.TbRatio)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.TbGear)
-        Me.Controls.Add(Me.TableLayoutPanel1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "F_GBX_GearDlog"
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "Edit Gears"
-        Me.TableLayoutPanel1.ResumeLayout(False)
-        Me.PnShiftPoly.ResumeLayout(False)
-        Me.PnShiftPoly.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+		Me.OK_Button = New System.Windows.Forms.Button()
+		Me.Cancel_Button = New System.Windows.Forms.Button()
+		Me.TbGear = New System.Windows.Forms.TextBox()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.TbRatio = New System.Windows.Forms.TextBox()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.TbMapPath = New System.Windows.Forms.TextBox()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.BtBrowse = New System.Windows.Forms.Button()
+		Me.BtNext = New System.Windows.Forms.Button()
+		Me.ChIsTCgear = New System.Windows.Forms.CheckBox()
+		Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
+		Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.PnShiftPoly = New System.Windows.Forms.Panel()
+		Me.Label5 = New System.Windows.Forms.Label()
+		Me.BtBrowseFld = New System.Windows.Forms.Button()
+		Me.TbFld = New System.Windows.Forms.TextBox()
+		Me.PnFld = New System.Windows.Forms.Panel()
+		Me.Label6 = New System.Windows.Forms.Label()
+		Me.TableLayoutPanel1.SuspendLayout()
+		Me.PnShiftPoly.SuspendLayout()
+		Me.PnFld.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'TableLayoutPanel1
+		'
+		Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TableLayoutPanel1.ColumnCount = 2
+		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+		Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+		Me.TableLayoutPanel1.Location = New System.Drawing.Point(380, 217)
+		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+		Me.TableLayoutPanel1.RowCount = 1
+		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+		Me.TableLayoutPanel1.TabIndex = 0
+		'
+		'OK_Button
+		'
+		Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+		Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+		Me.OK_Button.Name = "OK_Button"
+		Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+		Me.OK_Button.TabIndex = 0
+		Me.OK_Button.Text = "OK"
+		'
+		'Cancel_Button
+		'
+		Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+		Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+		Me.Cancel_Button.Name = "Cancel_Button"
+		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+		Me.Cancel_Button.TabIndex = 1
+		Me.Cancel_Button.Text = "Cancel"
+		'
+		'TbGear
+		'
+		Me.TbGear.Location = New System.Drawing.Point(48, 6)
+		Me.TbGear.Name = "TbGear"
+		Me.TbGear.ReadOnly = True
+		Me.TbGear.Size = New System.Drawing.Size(37, 20)
+		Me.TbGear.TabIndex = 1
+		Me.TbGear.TabStop = False
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(12, 9)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(30, 13)
+		Me.Label1.TabIndex = 2
+		Me.Label1.Text = "Gear"
+		'
+		'TbRatio
+		'
+		Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbRatio.Location = New System.Drawing.Point(149, 6)
+		Me.TbRatio.Name = "TbRatio"
+		Me.TbRatio.Size = New System.Drawing.Size(66, 20)
+		Me.TbRatio.TabIndex = 3
+		'
+		'Label2
+		'
+		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(111, 9)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(32, 13)
+		Me.Label2.TabIndex = 4
+		Me.Label2.Text = "Ratio"
+		'
+		'TbMapPath
+		'
+		Me.TbMapPath.Location = New System.Drawing.Point(12, 61)
+		Me.TbMapPath.Name = "TbMapPath"
+		Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
+		Me.TbMapPath.TabIndex = 5
+		'
+		'Label3
+		'
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(12, 45)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(126, 13)
+		Me.Label3.TabIndex = 7
+		Me.Label3.Text = "Loss Map or Efficiency [-]"
+		'
+		'BtBrowse
+		'
+		Me.BtBrowse.Location = New System.Drawing.Point(494, 59)
+		Me.BtBrowse.Name = "BtBrowse"
+		Me.BtBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtBrowse.TabIndex = 8
+		Me.BtBrowse.Text = "..."
+		Me.BtBrowse.UseVisualStyleBackColor = True
+		'
+		'BtNext
+		'
+		Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtNext.Location = New System.Drawing.Point(307, 220)
+		Me.BtNext.Name = "BtNext"
+		Me.BtNext.Size = New System.Drawing.Size(67, 23)
+		Me.BtNext.TabIndex = 9
+		Me.BtNext.Text = "&Next"
+		Me.BtNext.UseVisualStyleBackColor = True
+		'
+		'ChIsTCgear
+		'
+		Me.ChIsTCgear.AutoSize = True
+		Me.ChIsTCgear.Location = New System.Drawing.Point(236, 8)
+		Me.ChIsTCgear.Name = "ChIsTCgear"
+		Me.ChIsTCgear.Size = New System.Drawing.Size(241, 17)
+		Me.ChIsTCgear.TabIndex = 10
+		Me.ChIsTCgear.Text = "Torque Conveter active (lock-up clutch open)"
+		Me.ChIsTCgear.UseVisualStyleBackColor = True
+		'
+		'TbShiftPolyFile
+		'
+		Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
+		Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
+		Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
+		Me.TbShiftPolyFile.TabIndex = 12
+		'
+		'BtShiftPolyBrowse
+		'
+		Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(484, 15)
+		Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
+		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtShiftPolyBrowse.TabIndex = 13
+		Me.BtShiftPolyBrowse.TabStop = False
+		Me.BtShiftPolyBrowse.Text = "..."
+		Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
+		'
+		'Label4
+		'
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(2, 1)
+		Me.Label4.Name = "Label4"
+		Me.Label4.Size = New System.Drawing.Size(89, 13)
+		Me.Label4.TabIndex = 11
+		Me.Label4.Text = "Shift polygons file"
+		'
+		'PnShiftPoly
+		'
+		Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
+		Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
+		Me.PnShiftPoly.Controls.Add(Me.Label4)
+		Me.PnShiftPoly.Location = New System.Drawing.Point(10, 90)
+		Me.PnShiftPoly.Name = "PnShiftPoly"
+		Me.PnShiftPoly.Size = New System.Drawing.Size(525, 46)
+		Me.PnShiftPoly.TabIndex = 14
+		'
+		'Label5
+		'
+		Me.Label5.AutoSize = True
+		Me.Label5.Location = New System.Drawing.Point(2, 3)
+		Me.Label5.Name = "Label5"
+		Me.Label5.Size = New System.Drawing.Size(81, 13)
+		Me.Label5.TabIndex = 11
+		Me.Label5.Text = "Full Load Curve"
+		'
+		'BtBrowseFld
+		'
+		Me.BtBrowseFld.Location = New System.Drawing.Point(484, 17)
+		Me.BtBrowseFld.Name = "BtBrowseFld"
+		Me.BtBrowseFld.Size = New System.Drawing.Size(32, 23)
+		Me.BtBrowseFld.TabIndex = 13
+		Me.BtBrowseFld.TabStop = False
+		Me.BtBrowseFld.Text = "..."
+		Me.BtBrowseFld.UseVisualStyleBackColor = True
+		'
+		'TbFld
+		'
+		Me.TbFld.Location = New System.Drawing.Point(2, 19)
+		Me.TbFld.Name = "TbFld"
+		Me.TbFld.Size = New System.Drawing.Size(476, 20)
+		Me.TbFld.TabIndex = 12
+		'
+		'PnFld
+		'
+		Me.PnFld.Controls.Add(Me.Label6)
+		Me.PnFld.Controls.Add(Me.TbFld)
+		Me.PnFld.Controls.Add(Me.BtBrowseFld)
+		Me.PnFld.Controls.Add(Me.Label5)
+		Me.PnFld.Location = New System.Drawing.Point(10, 144)
+		Me.PnFld.Name = "PnFld"
+		Me.PnFld.Size = New System.Drawing.Size(523, 65)
+		Me.PnFld.TabIndex = 15
+		'
+		'Label6
+		'
+		Me.Label6.AutoSize = True
+		Me.Label6.Location = New System.Drawing.Point(3, 42)
+		Me.Label6.Name = "Label6"
+		Me.Label6.Size = New System.Drawing.Size(344, 13)
+		Me.Label6.TabIndex = 14
+		Me.Label6.Text = "If no file is defined the Full Load Curve from the Engine File will be used."
+		'
+		'F_GBX_GearDlog
+		'
+		Me.AcceptButton = Me.OK_Button
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.Cancel_Button
+		Me.ClientSize = New System.Drawing.Size(538, 258)
+		Me.Controls.Add(Me.PnFld)
+		Me.Controls.Add(Me.PnShiftPoly)
+		Me.Controls.Add(Me.ChIsTCgear)
+		Me.Controls.Add(Me.BtNext)
+		Me.Controls.Add(Me.BtBrowse)
+		Me.Controls.Add(Me.Label3)
+		Me.Controls.Add(Me.TbMapPath)
+		Me.Controls.Add(Me.Label2)
+		Me.Controls.Add(Me.TbRatio)
+		Me.Controls.Add(Me.Label1)
+		Me.Controls.Add(Me.TbGear)
+		Me.Controls.Add(Me.TableLayoutPanel1)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+		Me.MaximizeBox = False
+		Me.MinimizeBox = False
+		Me.Name = "F_GBX_GearDlog"
+		Me.ShowInTaskbar = False
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "Edit Gears"
+		Me.TableLayoutPanel1.ResumeLayout(False)
+		Me.PnShiftPoly.ResumeLayout(False)
+		Me.PnShiftPoly.PerformLayout()
+		Me.PnFld.ResumeLayout(False)
+		Me.PnFld.PerformLayout()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-    End Sub
-    Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
-    Friend WithEvents OK_Button As System.Windows.Forms.Button
-    Friend WithEvents Cancel_Button As System.Windows.Forms.Button
-    Friend WithEvents TbGear As System.Windows.Forms.TextBox
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents TbRatio As System.Windows.Forms.TextBox
-    Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents TbMapPath As System.Windows.Forms.TextBox
-    Friend WithEvents Label3 As System.Windows.Forms.Label
-    Friend WithEvents BtBrowse As System.Windows.Forms.Button
-    Friend WithEvents BtNext As System.Windows.Forms.Button
-    Friend WithEvents ChIsTCgear As System.Windows.Forms.CheckBox
-    Friend WithEvents TbShiftPolyFile As System.Windows.Forms.TextBox
-    Friend WithEvents BtShiftPolyBrowse As System.Windows.Forms.Button
-    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents PnShiftPoly As System.Windows.Forms.Panel
+	End Sub
+	Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
+	Friend WithEvents OK_Button As System.Windows.Forms.Button
+	Friend WithEvents Cancel_Button As System.Windows.Forms.Button
+	Friend WithEvents TbGear As System.Windows.Forms.TextBox
+	Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents TbRatio As System.Windows.Forms.TextBox
+	Friend WithEvents Label2 As System.Windows.Forms.Label
+	Friend WithEvents TbMapPath As System.Windows.Forms.TextBox
+	Friend WithEvents Label3 As System.Windows.Forms.Label
+	Friend WithEvents BtBrowse As System.Windows.Forms.Button
+	Friend WithEvents BtNext As System.Windows.Forms.Button
+	Friend WithEvents ChIsTCgear As System.Windows.Forms.CheckBox
+	Friend WithEvents TbShiftPolyFile As System.Windows.Forms.TextBox
+	Friend WithEvents BtShiftPolyBrowse As System.Windows.Forms.Button
+	Friend WithEvents Label4 As System.Windows.Forms.Label
+	Friend WithEvents PnShiftPoly As System.Windows.Forms.Panel
+	Friend WithEvents Label5 As System.Windows.Forms.Label
+	Friend WithEvents BtBrowseFld As System.Windows.Forms.Button
+	Friend WithEvents TbFld As System.Windows.Forms.TextBox
+	Friend WithEvents PnFld As System.Windows.Forms.Panel
+	Friend WithEvents Label6 As System.Windows.Forms.Label
 
 End Class
diff --git a/VECTO/GUI/F_GBX_GearDlog.vb b/VECTO/GUI/F_GBX_GearDlog.vb
index 5ff8cf9d7556e6fdc7209bb1c94c692d792f778c..b76b14dd617f8bbdc1236976b91cdc86464026ab 100644
--- a/VECTO/GUI/F_GBX_GearDlog.vb
+++ b/VECTO/GUI/F_GBX_GearDlog.vb
@@ -18,7 +18,7 @@ Imports System.Windows.Forms
 Public Class F_GBX_GearDlog
 
     Public NextGear As Boolean
-    Public GbxPath As String
+	Public GbxPath As String
 
     'Save and Close
     Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
@@ -65,10 +65,16 @@ Public Class F_GBX_GearDlog
     End Sub
 
     'Browse for shift polygons file
-    Private Sub BtShiftPolyBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtShiftPolyBrowse.Click
-        If fbGBS.OpenDialog(fFileRepl(Me.TbShiftPolyFile.Text, GbxPath)) Then
-            Me.TbShiftPolyFile.Text = fFileWoDir(fbGBS.Files(0), GbxPath)
-        End If
-    End Sub
+	Private Sub BtShiftPolyBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtShiftPolyBrowse.Click
+		If fbGBS.OpenDialog(fFileRepl(Me.TbShiftPolyFile.Text, GbxPath)) Then
+			Me.TbShiftPolyFile.Text = fFileWoDir(fbGBS.Files(0), GbxPath)
+		End If
+	End Sub
+
+	Private Sub BtBrowseFld_Click(sender As Object, e As EventArgs) Handles BtBrowseFld.Click
+		If fbFLD.OpenDialog(fFileRepl(Me.TbFld.Text, GbxPath)) Then
+			Me.TbFld.Text = fFileWoDir(fbFLD.Files(0), GbxPath)
+		End If
+	End Sub
 
 End Class
diff --git a/VECTO/GUI/F_JIRA.Designer.vb b/VECTO/GUI/F_JIRA.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..53d7aa283ffd0282c4728733163b2390449c9627
--- /dev/null
+++ b/VECTO/GUI/F_JIRA.Designer.vb
@@ -0,0 +1,134 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class F_JIRA
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+		Me.OK_Button = New System.Windows.Forms.Button()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
+		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+		Me.LinkLabel3 = New System.Windows.Forms.LinkLabel()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.Button1 = New System.Windows.Forms.Button()
+		Me.GroupBox1.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'OK_Button
+		'
+		Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.OK_Button.Location = New System.Drawing.Point(356, 205)
+		Me.OK_Button.Name = "OK_Button"
+		Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+		Me.OK_Button.TabIndex = 0
+		Me.OK_Button.Text = "Close"
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(6, 16)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(272, 13)
+		Me.Label1.TabIndex = 1
+		Me.Label1.Text = "You need a user account for CITnet create a new issue."
+		'
+		'LinkLabel1
+		'
+		Me.LinkLabel1.AutoSize = True
+		Me.LinkLabel1.Location = New System.Drawing.Point(6, 65)
+		Me.LinkLabel1.Name = "LinkLabel1"
+		Me.LinkLabel1.Size = New System.Drawing.Size(141, 13)
+		Me.LinkLabel1.TabIndex = 2
+		Me.LinkLabel1.TabStop = True
+		Me.LinkLabel1.Text = "JIRA Quick Start Guide (pdf)"
+		'
+		'GroupBox1
+		'
+		Me.GroupBox1.Controls.Add(Me.LinkLabel3)
+		Me.GroupBox1.Controls.Add(Me.Label1)
+		Me.GroupBox1.Controls.Add(Me.Label2)
+		Me.GroupBox1.Controls.Add(Me.LinkLabel1)
+		Me.GroupBox1.Location = New System.Drawing.Point(12, 86)
+		Me.GroupBox1.Name = "GroupBox1"
+		Me.GroupBox1.Size = New System.Drawing.Size(411, 100)
+		Me.GroupBox1.TabIndex = 3
+		Me.GroupBox1.TabStop = False
+		Me.GroupBox1.Text = "Help"
+		'
+		'LinkLabel3
+		'
+		Me.LinkLabel3.AutoSize = True
+		Me.LinkLabel3.Location = New System.Drawing.Point(274, 39)
+		Me.LinkLabel3.Name = "LinkLabel3"
+		Me.LinkLabel3.Size = New System.Drawing.Size(122, 13)
+		Me.LinkLabel3.TabIndex = 18
+		Me.LinkLabel3.TabStop = True
+		Me.LinkLabel3.Text = "vecto@jrc.ec.europa.eu"
+		'
+		'Label2
+		'
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(6, 39)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(275, 13)
+		Me.Label2.TabIndex = 3
+		Me.Label2.Text = "If you don't have CITnet access please contact support: "
+		'
+		'Button1
+		'
+		Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Button1.Location = New System.Drawing.Point(12, 12)
+		Me.Button1.Name = "Button1"
+		Me.Button1.Size = New System.Drawing.Size(411, 54)
+		Me.Button1.TabIndex = 4
+		Me.Button1.Text = "Create JIRA Issue"
+		Me.Button1.UseVisualStyleBackColor = True
+		'
+		'F_JIRA
+		'
+		Me.AcceptButton = Me.OK_Button
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.ClientSize = New System.Drawing.Size(435, 240)
+		Me.Controls.Add(Me.Button1)
+		Me.Controls.Add(Me.GroupBox1)
+		Me.Controls.Add(Me.OK_Button)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+		Me.MaximizeBox = False
+		Me.MinimizeBox = False
+		Me.Name = "F_JIRA"
+		Me.ShowInTaskbar = False
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "Report Issue via CITnet"
+		Me.GroupBox1.ResumeLayout(False)
+		Me.GroupBox1.PerformLayout()
+		Me.ResumeLayout(False)
+
+	End Sub
+	Friend WithEvents OK_Button As System.Windows.Forms.Button
+	Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel
+	Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
+	Friend WithEvents Label2 As System.Windows.Forms.Label
+	Friend WithEvents LinkLabel3 As System.Windows.Forms.LinkLabel
+	Friend WithEvents Button1 As System.Windows.Forms.Button
+
+End Class
diff --git a/VECTO/GUI/F_FLD.resx b/VECTO/GUI/F_JIRA.resx
similarity index 94%
rename from VECTO/GUI/F_FLD.resx
rename to VECTO/GUI/F_JIRA.resx
index 8d65b0426f944bfb18109b2588494bb7c9af1893..1af7de150c99c12dd67a509fe57c10d63e4eeb04 100644
--- a/VECTO/GUI/F_FLD.resx
+++ b/VECTO/GUI/F_JIRA.resx
@@ -1,123 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_JIRA.vb b/VECTO/GUI/F_JIRA.vb
new file mode 100644
index 0000000000000000000000000000000000000000..937b83e864bbf34f40ac10cf21f3a6c83a6f12f9
--- /dev/null
+++ b/VECTO/GUI/F_JIRA.vb
@@ -0,0 +1,40 @@
+Imports System.Windows.Forms
+
+Public Class F_JIRA
+
+    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
+        Me.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Close()
+    End Sub
+
+	Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
+		Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.Close()
+	End Sub
+
+	Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
+		If IO.File.Exists(MyAppPath & "User Manual\JIRA Quick Start.pdf") Then
+			System.Diagnostics.Process.Start(MyAppPath & "User Manual\JIRA Quick Start.pdf")
+		Else
+			MsgBox("File not found!", MsgBoxStyle.Critical)
+		End If
+	End Sub
+
+	Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked
+		Dim bodytext As String
+
+		bodytext = "Please provide the following information:" & "%0A" & _
+				   "- Email" & "%0A" & _
+				   "- Name, Surname" & "%0A" & _
+				   "- Country of workplace" & "%0A" & _
+				   "- Position"
+
+		System.Diagnostics.Process.Start("mailto:vecto@jrc.ec.europa.eu?subject=CITnet%20account&body=" & bodytext)
+
+	End Sub
+
+	Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+		System.Diagnostics.Process.Start("https://webgate.ec.europa.eu/CITnet/jira/browse/VECTO")
+	End Sub
+
+End Class
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index d355a8afce5c441960cb6ce5b1438c0452bf0f14..846eb8ff21e28fe6ddec8ddd371dc71f09819b0e 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -119,6 +119,7 @@ Partial Class F_MAINForm
 		Me.ToolStripDrDnBtInfo = New System.Windows.Forms.ToolStripDropDownButton()
 		Me.UserManualToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
 		Me.UpdateNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.ReportBugViaCITnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
 		Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
 		Me.CreateActivationFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
 		Me.AboutVECTOToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -933,7 +934,7 @@ Partial Class F_MAINForm
 		'
 		'ToolStripDrDnBtInfo
 		'
-		Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateActivationFileToolStripMenuItem, Me.AboutVECTOToolStripMenuItem1})
+		Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateActivationFileToolStripMenuItem, Me.AboutVECTOToolStripMenuItem1})
 		Me.ToolStripDrDnBtInfo.Image = Global.VECTO.My.Resources.Resources.Help_icon
 		Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta
 		Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo"
@@ -943,30 +944,36 @@ Partial Class F_MAINForm
 		'UserManualToolStripMenuItem
 		'
 		Me.UserManualToolStripMenuItem.Name = "UserManualToolStripMenuItem"
-		Me.UserManualToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+		Me.UserManualToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
 		Me.UserManualToolStripMenuItem.Text = "User Manual"
 		'
 		'UpdateNotesToolStripMenuItem
 		'
 		Me.UpdateNotesToolStripMenuItem.Name = "UpdateNotesToolStripMenuItem"
-		Me.UpdateNotesToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+		Me.UpdateNotesToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
 		Me.UpdateNotesToolStripMenuItem.Text = "Release Notes"
 		'
+		'ReportBugViaCITnetToolStripMenuItem
+		'
+		Me.ReportBugViaCITnetToolStripMenuItem.Name = "ReportBugViaCITnetToolStripMenuItem"
+		Me.ReportBugViaCITnetToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
+		Me.ReportBugViaCITnetToolStripMenuItem.Text = "Report Bug via CITnet"
+		'
 		'ToolStripSeparator3
 		'
 		Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-		Me.ToolStripSeparator3.Size = New System.Drawing.Size(183, 6)
+		Me.ToolStripSeparator3.Size = New System.Drawing.Size(186, 6)
 		'
 		'CreateActivationFileToolStripMenuItem
 		'
 		Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem"
-		Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+		Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
 		Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File"
 		'
 		'AboutVECTOToolStripMenuItem1
 		'
 		Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1"
-		Me.AboutVECTOToolStripMenuItem1.Size = New System.Drawing.Size(186, 22)
+		Me.AboutVECTOToolStripMenuItem1.Size = New System.Drawing.Size(189, 22)
 		Me.AboutVECTOToolStripMenuItem1.Text = "About VECTO"
 		'
 		'CmDEV
@@ -1139,6 +1146,7 @@ End Sub
     Friend WithEvents RbDev As System.Windows.Forms.RadioButton
     Friend WithEvents RbDecl As System.Windows.Forms.RadioButton
     Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-    Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents ReportBugViaCITnetToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
 
 End Class
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 62dc0cdae0fb34b3f3e64622f06b13a675ef12c0..de9f4a527480123853c655a95533f2f7994ba30e 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -444,7 +444,7 @@ Public Class F_MAINForm
 		CycleTabPage = Me.TabPageDRI
 
 		DEVpage = Me.TabPageDEV
-		Me.TabControl1.Controls.Remove(DEVpage)
+		'Me.TabControl1.Controls.Remove(DEVpage)
 
 		LastModeName = ""
 
@@ -524,6 +524,16 @@ Public Class F_MAINForm
 			End If
 		End If
 
+		If DEV.Enabled Then
+			If Not Cfg.DeclMode Then
+				If Not Me.TabControl1.TabPages.Contains(DEVpage) Then Me.TabControl1.TabPages.Insert(Me.TabControl1.TabPages.Count, DEVpage)
+				LoadDEVconfigs()
+			Else
+				If Me.TabControl1.TabPages.Contains(DEVpage) Then Me.TabControl1.Controls.Remove(DEVpage)
+				DEV.SetDefault()
+			End If
+		End If
+
 		Status(LastModeName & " Mode")
 
 		Me.LoadOptions()
@@ -538,9 +548,9 @@ Public Class F_MAINForm
 		Dim fwelcome As F_Welcome
 
 		'DEV Form
-		If DEV.Enabled Then
-			Me.TabControl1.TabPages.Insert(Me.TabControl1.TabPages.Count, DEVpage)
-		End If
+		'If DEV.Enabled And Not Cfg.DeclMode Then
+		'	Me.TabControl1.TabPages.Insert(Me.TabControl1.TabPages.Count, DEVpage)
+		'End If
 
 		'VECTO Init
 		Declaration.Init()
@@ -1293,6 +1303,10 @@ lbFound:
 		End If
 	End Sub
 
+	Private Sub ReportBugViaCITnetToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReportBugViaCITnetToolStripMenuItem.Click
+		F_JIRA.ShowDialog()
+	End Sub
+
 	Private Sub CreateActivationFileToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _
 		Handles CreateActivationFileToolStripMenuItem.Click
 		If MsgBox("Create Activation File ?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
@@ -2437,4 +2451,5 @@ Lb1:
 	End Sub
 
 #End Region
+
 End Class
diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb
index ce990fd895882a997dcb7da25c99ab433d99bbbf..903aa5ae7f75a1ed6aca66b16261ce5c917cb735 100644
--- a/VECTO/GUI/F_VECTO.Designer.vb
+++ b/VECTO/GUI/F_VECTO.Designer.vb
@@ -22,1064 +22,1064 @@ Partial Class F_VECTO
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_VECTO))
-        Me.TabPgGen = New System.Windows.Forms.TabPage()
-        Me.GrCycles = New System.Windows.Forms.GroupBox()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.LvCycles = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.BtDRIrem = New System.Windows.Forms.Button()
-        Me.BtDRIadd = New System.Windows.Forms.Button()
-        Me.GrAux = New System.Windows.Forms.GroupBox()
-        Me.Label32 = New System.Windows.Forms.Label()
-        Me.LvAux = New System.Windows.Forms.ListView()
-        Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ButAuxRem = New System.Windows.Forms.Button()
-        Me.ButAuxAdd = New System.Windows.Forms.Button()
-        Me.TbGBX = New System.Windows.Forms.TextBox()
-        Me.TbENG = New System.Windows.Forms.TextBox()
-        Me.TbVEH = New System.Windows.Forms.TextBox()
-        Me.ButOpenGBX = New System.Windows.Forms.Button()
-        Me.ButOpenENG = New System.Windows.Forms.Button()
-        Me.ButOpenVEH = New System.Windows.Forms.Button()
-        Me.ButtonVEH = New System.Windows.Forms.Button()
-        Me.ButtonGBX = New System.Windows.Forms.Button()
-        Me.ButtonMAP = New System.Windows.Forms.Button()
-        Me.TabControl1 = New System.Windows.Forms.TabControl()
-        Me.TabPgDriver = New System.Windows.Forms.TabPage()
-        Me.GrVACC = New System.Windows.Forms.GroupBox()
-        Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
-        Me.BtDesMaxBr = New System.Windows.Forms.Button()
-        Me.BtAccOpen = New System.Windows.Forms.Button()
-        Me.GrLAC = New System.Windows.Forms.GroupBox()
-        Me.PnLookAhead = New System.Windows.Forms.Panel()
-        Me.Label29 = New System.Windows.Forms.Label()
-        Me.Label25 = New System.Windows.Forms.Label()
-        Me.TbAlookahead = New System.Windows.Forms.TextBox()
-        Me.Label24 = New System.Windows.Forms.Label()
-        Me.TbVminLA = New System.Windows.Forms.TextBox()
-        Me.Label28 = New System.Windows.Forms.Label()
-        Me.CbLookAhead = New System.Windows.Forms.CheckBox()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.PnEcoRoll = New System.Windows.Forms.Panel()
-        Me.Label21 = New System.Windows.Forms.Label()
-        Me.Label20 = New System.Windows.Forms.Label()
-        Me.Label14 = New System.Windows.Forms.Label()
-        Me.TbVmin = New System.Windows.Forms.TextBox()
-        Me.TbUnderSpeed = New System.Windows.Forms.TextBox()
-        Me.TbOverspeed = New System.Windows.Forms.TextBox()
-        Me.Label23 = New System.Windows.Forms.Label()
-        Me.Label22 = New System.Windows.Forms.Label()
-        Me.Label13 = New System.Windows.Forms.Label()
-        Me.RdEcoRoll = New System.Windows.Forms.RadioButton()
-        Me.RdOverspeed = New System.Windows.Forms.RadioButton()
-        Me.RdOff = New System.Windows.Forms.RadioButton()
-        Me.GrStartStop = New System.Windows.Forms.GroupBox()
-        Me.PnStartStop = New System.Windows.Forms.Panel()
-        Me.Label31 = New System.Windows.Forms.Label()
-        Me.Label27 = New System.Windows.Forms.Label()
-        Me.TbSSspeed = New System.Windows.Forms.TextBox()
-        Me.LabelSSspeed = New System.Windows.Forms.Label()
-        Me.Label26 = New System.Windows.Forms.Label()
-        Me.Label30 = New System.Windows.Forms.Label()
-        Me.LabelSStime = New System.Windows.Forms.Label()
-        Me.TbSSdelay = New System.Windows.Forms.TextBox()
-        Me.TbSStime = New System.Windows.Forms.TextBox()
-        Me.ChBStartStop = New System.Windows.Forms.CheckBox()
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ButOK = New System.Windows.Forms.Button()
-        Me.ButCancel = New System.Windows.Forms.Button()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.CbEngOnly = New System.Windows.Forms.CheckBox()
-        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.PicVehicle = New System.Windows.Forms.PictureBox()
-        Me.PicBox = New System.Windows.Forms.PictureBox()
-        Me.TbEngTxt = New System.Windows.Forms.TextBox()
-        Me.TbVehCat = New System.Windows.Forms.TextBox()
-        Me.TbAxleConf = New System.Windows.Forms.TextBox()
-        Me.TbHVCclass = New System.Windows.Forms.TextBox()
-        Me.TbGbxTxt = New System.Windows.Forms.TextBox()
-        Me.TbMass = New System.Windows.Forms.TextBox()
-        Me.TabPgGen.SuspendLayout()
-        Me.GrCycles.SuspendLayout()
-        Me.GrAux.SuspendLayout()
-        Me.TabControl1.SuspendLayout()
-        Me.TabPgDriver.SuspendLayout()
-        Me.GrVACC.SuspendLayout()
-        Me.GrLAC.SuspendLayout()
-        Me.PnLookAhead.SuspendLayout()
-        Me.GroupBox1.SuspendLayout()
-        Me.PnEcoRoll.SuspendLayout()
-        Me.GrStartStop.SuspendLayout()
-        Me.PnStartStop.SuspendLayout()
-        Me.StatusStrip1.SuspendLayout()
-        Me.ToolStrip1.SuspendLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.CmOpenFile.SuspendLayout()
-        CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'TabPgGen
-        '
-        Me.TabPgGen.Controls.Add(Me.GrCycles)
-        Me.TabPgGen.Controls.Add(Me.GrAux)
-        Me.TabPgGen.Controls.Add(Me.TbGBX)
-        Me.TabPgGen.Controls.Add(Me.TbENG)
-        Me.TabPgGen.Controls.Add(Me.TbVEH)
-        Me.TabPgGen.Controls.Add(Me.ButOpenGBX)
-        Me.TabPgGen.Controls.Add(Me.ButOpenENG)
-        Me.TabPgGen.Controls.Add(Me.ButOpenVEH)
-        Me.TabPgGen.Controls.Add(Me.ButtonVEH)
-        Me.TabPgGen.Controls.Add(Me.ButtonGBX)
-        Me.TabPgGen.Controls.Add(Me.ButtonMAP)
-        Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
-        Me.TabPgGen.Name = "TabPgGen"
-        Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPgGen.Size = New System.Drawing.Size(527, 491)
-        Me.TabPgGen.TabIndex = 0
-        Me.TabPgGen.Text = "General"
-        Me.TabPgGen.UseVisualStyleBackColor = True
-        '
-        'GrCycles
-        '
-        Me.GrCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GrCycles.Controls.Add(Me.Label2)
-        Me.GrCycles.Controls.Add(Me.LvCycles)
-        Me.GrCycles.Controls.Add(Me.BtDRIrem)
-        Me.GrCycles.Controls.Add(Me.BtDRIadd)
-        Me.GrCycles.Location = New System.Drawing.Point(7, 271)
-        Me.GrCycles.Name = "GrCycles"
-        Me.GrCycles.Size = New System.Drawing.Size(515, 208)
-        Me.GrCycles.TabIndex = 34
-        Me.GrCycles.TabStop = False
-        Me.GrCycles.Text = "Cycles"
-        '
-        'Label2
-        '
-        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(387, 153)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(122, 13)
-        Me.Label2.TabIndex = 33
-        Me.Label2.Text = "Double-Click to open file"
-        '
-        'LvCycles
-        '
-        Me.LvCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
-        Me.LvCycles.FullRowSelect = True
-        Me.LvCycles.GridLines = True
-        Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
-        Me.LvCycles.HideSelection = False
-        Me.LvCycles.LabelEdit = True
-        Me.LvCycles.Location = New System.Drawing.Point(6, 19)
-        Me.LvCycles.MultiSelect = False
-        Me.LvCycles.Name = "LvCycles"
-        Me.LvCycles.Size = New System.Drawing.Size(503, 123)
-        Me.LvCycles.TabIndex = 0
-        Me.LvCycles.TabStop = False
-        Me.LvCycles.UseCompatibleStateImageBehavior = False
-        Me.LvCycles.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "Cycle path"
-        Me.ColumnHeader1.Width = 470
-        '
-        'BtDRIrem
-        '
-        Me.BtDRIrem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtDRIrem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.BtDRIrem.Location = New System.Drawing.Point(41, 148)
-        Me.BtDRIrem.Name = "BtDRIrem"
-        Me.BtDRIrem.Size = New System.Drawing.Size(29, 23)
-        Me.BtDRIrem.TabIndex = 32
-        Me.BtDRIrem.UseVisualStyleBackColor = True
-        '
-        'BtDRIadd
-        '
-        Me.BtDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.BtDRIadd.Location = New System.Drawing.Point(6, 148)
-        Me.BtDRIadd.Name = "BtDRIadd"
-        Me.BtDRIadd.Size = New System.Drawing.Size(29, 23)
-        Me.BtDRIadd.TabIndex = 31
-        Me.BtDRIadd.UseVisualStyleBackColor = True
-        '
-        'GrAux
-        '
-        Me.GrAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GrAux.Controls.Add(Me.Label32)
-        Me.GrAux.Controls.Add(Me.LvAux)
-        Me.GrAux.Controls.Add(Me.ButAuxRem)
-        Me.GrAux.Controls.Add(Me.ButAuxAdd)
-        Me.GrAux.Location = New System.Drawing.Point(6, 87)
-        Me.GrAux.Name = "GrAux"
-        Me.GrAux.Size = New System.Drawing.Size(515, 209)
-        Me.GrAux.TabIndex = 33
-        Me.GrAux.TabStop = False
-        Me.GrAux.Text = "Auxiliaries"
-        '
-        'Label32
-        '
-        Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label32.AutoSize = True
-        Me.Label32.Location = New System.Drawing.Point(369, 147)
-        Me.Label32.Name = "Label32"
-        Me.Label32.Size = New System.Drawing.Size(139, 13)
-        Me.Label32.TabIndex = 34
-        Me.Label32.Text = "Double-Click to edit auxiliary"
-        '
-        'LvAux
-        '
-        Me.LvAux.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
-        Me.LvAux.FullRowSelect = True
-        Me.LvAux.GridLines = True
-        Me.LvAux.HideSelection = False
-        Me.LvAux.Location = New System.Drawing.Point(6, 19)
-        Me.LvAux.MultiSelect = False
-        Me.LvAux.Name = "LvAux"
-        Me.LvAux.Size = New System.Drawing.Size(503, 117)
-        Me.LvAux.TabIndex = 30
-        Me.LvAux.TabStop = False
-        Me.LvAux.UseCompatibleStateImageBehavior = False
-        Me.LvAux.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader4
-        '
-        Me.ColumnHeader4.Text = "ID"
-        Me.ColumnHeader4.Width = 45
-        '
-        'ColumnHeader5
-        '
-        Me.ColumnHeader5.Text = "Type"
-        Me.ColumnHeader5.Width = 108
-        '
-        'ColumnHeader6
-        '
-        Me.ColumnHeader6.Text = "Input File"
-        Me.ColumnHeader6.Width = 331
-        '
-        'ButAuxRem
-        '
-        Me.ButAuxRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.ButAuxRem.Location = New System.Drawing.Point(42, 142)
-        Me.ButAuxRem.Name = "ButAuxRem"
-        Me.ButAuxRem.Size = New System.Drawing.Size(29, 23)
-        Me.ButAuxRem.TabIndex = 32
-        Me.ButAuxRem.UseVisualStyleBackColor = True
-        '
-        'ButAuxAdd
-        '
-        Me.ButAuxAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.ButAuxAdd.Location = New System.Drawing.Point(7, 142)
-        Me.ButAuxAdd.Name = "ButAuxAdd"
-        Me.ButAuxAdd.Size = New System.Drawing.Size(29, 23)
-        Me.ButAuxAdd.TabIndex = 31
-        Me.ButAuxAdd.UseVisualStyleBackColor = True
-        '
-        'TbGBX
-        '
-        Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbGBX.Location = New System.Drawing.Point(84, 60)
-        Me.TbGBX.Name = "TbGBX"
-        Me.TbGBX.Size = New System.Drawing.Size(406, 20)
-        Me.TbGBX.TabIndex = 3
-        '
-        'TbENG
-        '
-        Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbENG.Location = New System.Drawing.Point(84, 33)
-        Me.TbENG.Name = "TbENG"
-        Me.TbENG.Size = New System.Drawing.Size(406, 20)
-        Me.TbENG.TabIndex = 2
-        '
-        'TbVEH
-        '
-        Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbVEH.Location = New System.Drawing.Point(84, 7)
-        Me.TbVEH.Name = "TbVEH"
-        Me.TbVEH.Size = New System.Drawing.Size(406, 20)
-        Me.TbVEH.TabIndex = 1
-        '
-        'ButOpenGBX
-        '
-        Me.ButOpenGBX.Location = New System.Drawing.Point(6, 60)
-        Me.ButOpenGBX.Name = "ButOpenGBX"
-        Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenGBX.TabIndex = 22
-        Me.ButOpenGBX.TabStop = False
-        Me.ButOpenGBX.Text = "Gearbox"
-        Me.ButOpenGBX.UseVisualStyleBackColor = True
-        '
-        'ButOpenENG
-        '
-        Me.ButOpenENG.Location = New System.Drawing.Point(6, 33)
-        Me.ButOpenENG.Name = "ButOpenENG"
-        Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenENG.TabIndex = 21
-        Me.ButOpenENG.TabStop = False
-        Me.ButOpenENG.Text = "Engine"
-        Me.ButOpenENG.UseVisualStyleBackColor = True
-        '
-        'ButOpenVEH
-        '
-        Me.ButOpenVEH.Location = New System.Drawing.Point(6, 6)
-        Me.ButOpenVEH.Name = "ButOpenVEH"
-        Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenVEH.TabIndex = 20
-        Me.ButOpenVEH.TabStop = False
-        Me.ButOpenVEH.Text = "Vehicle"
-        Me.ButOpenVEH.UseVisualStyleBackColor = True
-        '
-        'ButtonVEH
-        '
-        Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButtonVEH.Location = New System.Drawing.Point(496, 6)
-        Me.ButtonVEH.Name = "ButtonVEH"
-        Me.ButtonVEH.Size = New System.Drawing.Size(28, 21)
-        Me.ButtonVEH.TabIndex = 11
-        Me.ButtonVEH.TabStop = False
-        Me.ButtonVEH.Text = "..."
-        Me.ButtonVEH.UseVisualStyleBackColor = True
-        '
-        'ButtonGBX
-        '
-        Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButtonGBX.Location = New System.Drawing.Point(496, 60)
-        Me.ButtonGBX.Name = "ButtonGBX"
-        Me.ButtonGBX.Size = New System.Drawing.Size(28, 21)
-        Me.ButtonGBX.TabIndex = 13
-        Me.ButtonGBX.TabStop = False
-        Me.ButtonGBX.Text = "..."
-        Me.ButtonGBX.UseVisualStyleBackColor = True
-        '
-        'ButtonMAP
-        '
-        Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButtonMAP.Location = New System.Drawing.Point(496, 33)
-        Me.ButtonMAP.Name = "ButtonMAP"
-        Me.ButtonMAP.Size = New System.Drawing.Size(28, 21)
-        Me.ButtonMAP.TabIndex = 12
-        Me.ButtonMAP.TabStop = False
-        Me.ButtonMAP.Text = "..."
-        Me.ButtonMAP.UseVisualStyleBackColor = True
-        '
-        'TabControl1
-        '
-        Me.TabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TabControl1.Controls.Add(Me.TabPgGen)
-        Me.TabControl1.Controls.Add(Me.TabPgDriver)
-        Me.TabControl1.Location = New System.Drawing.Point(1, 107)
-        Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(535, 517)
-        Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
-        Me.TabControl1.TabIndex = 1
-        '
-        'TabPgDriver
-        '
-        Me.TabPgDriver.Controls.Add(Me.GrVACC)
-        Me.TabPgDriver.Controls.Add(Me.GrLAC)
-        Me.TabPgDriver.Controls.Add(Me.GroupBox1)
-        Me.TabPgDriver.Controls.Add(Me.GrStartStop)
-        Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
-        Me.TabPgDriver.Name = "TabPgDriver"
-        Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPgDriver.Size = New System.Drawing.Size(527, 491)
-        Me.TabPgDriver.TabIndex = 7
-        Me.TabPgDriver.Text = "Driver Assist"
-        Me.TabPgDriver.UseVisualStyleBackColor = True
-        '
-        'GrVACC
-        '
-        Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
-        Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
-        Me.GrVACC.Controls.Add(Me.BtAccOpen)
-        Me.GrVACC.Location = New System.Drawing.Point(6, 401)
-        Me.GrVACC.Name = "GrVACC"
-        Me.GrVACC.Size = New System.Drawing.Size(515, 84)
-        Me.GrVACC.TabIndex = 34
-        Me.GrVACC.TabStop = False
-        Me.GrVACC.Text = "Max. acceleration and brake curves"
-        '
-        'TbDesMaxFile
-        '
-        Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 29)
-        Me.TbDesMaxFile.Name = "TbDesMaxFile"
-        Me.TbDesMaxFile.Size = New System.Drawing.Size(440, 20)
-        Me.TbDesMaxFile.TabIndex = 0
-        '
-        'BtDesMaxBr
-        '
-        Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtDesMaxBr.Location = New System.Drawing.Point(452, 28)
-        Me.BtDesMaxBr.Name = "BtDesMaxBr"
-        Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 21)
-        Me.BtDesMaxBr.TabIndex = 1
-        Me.BtDesMaxBr.Text = "..."
-        Me.BtDesMaxBr.UseVisualStyleBackColor = True
-        '
-        'BtAccOpen
-        '
-        Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtAccOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtAccOpen.Location = New System.Drawing.Point(486, 27)
-        Me.BtAccOpen.Name = "BtAccOpen"
-        Me.BtAccOpen.Size = New System.Drawing.Size(23, 23)
-        Me.BtAccOpen.TabIndex = 2
-        Me.BtAccOpen.TabStop = False
-        Me.BtAccOpen.UseVisualStyleBackColor = True
-        '
-        'GrLAC
-        '
-        Me.GrLAC.Controls.Add(Me.PnLookAhead)
-        Me.GrLAC.Controls.Add(Me.CbLookAhead)
-        Me.GrLAC.Location = New System.Drawing.Point(7, 290)
-        Me.GrLAC.Name = "GrLAC"
-        Me.GrLAC.Size = New System.Drawing.Size(514, 105)
-        Me.GrLAC.TabIndex = 5
-        Me.GrLAC.TabStop = False
-        Me.GrLAC.Text = "Look-Ahead Coasting"
-        '
-        'PnLookAhead
-        '
-        Me.PnLookAhead.Controls.Add(Me.Label29)
-        Me.PnLookAhead.Controls.Add(Me.Label25)
-        Me.PnLookAhead.Controls.Add(Me.TbAlookahead)
-        Me.PnLookAhead.Controls.Add(Me.Label24)
-        Me.PnLookAhead.Controls.Add(Me.TbVminLA)
-        Me.PnLookAhead.Controls.Add(Me.Label28)
-        Me.PnLookAhead.Location = New System.Drawing.Point(117, 10)
-        Me.PnLookAhead.Name = "PnLookAhead"
-        Me.PnLookAhead.Size = New System.Drawing.Size(252, 71)
-        Me.PnLookAhead.TabIndex = 1
-        '
-        'Label29
-        '
-        Me.Label29.AutoSize = True
-        Me.Label29.Location = New System.Drawing.Point(197, 38)
-        Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(38, 13)
-        Me.Label29.TabIndex = 3
-        Me.Label29.Text = "[km/h]"
-        '
-        'Label25
-        '
-        Me.Label25.AutoSize = True
-        Me.Label25.Location = New System.Drawing.Point(197, 12)
-        Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(34, 13)
-        Me.Label25.TabIndex = 3
-        Me.Label25.Text = "[m/s²]"
-        '
-        'TbAlookahead
-        '
-        Me.TbAlookahead.Location = New System.Drawing.Point(127, 9)
-        Me.TbAlookahead.Name = "TbAlookahead"
-        Me.TbAlookahead.Size = New System.Drawing.Size(64, 20)
-        Me.TbAlookahead.TabIndex = 0
-        '
-        'Label24
-        '
-        Me.Label24.AutoSize = True
-        Me.Label24.Location = New System.Drawing.Point(25, 12)
-        Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(96, 13)
-        Me.Label24.TabIndex = 1
-        Me.Label24.Text = "Target Retardation"
-        '
-        'TbVminLA
-        '
-        Me.TbVminLA.Location = New System.Drawing.Point(127, 35)
-        Me.TbVminLA.Name = "TbVminLA"
-        Me.TbVminLA.Size = New System.Drawing.Size(64, 20)
-        Me.TbVminLA.TabIndex = 1
-        '
-        'Label28
-        '
-        Me.Label28.AutoSize = True
-        Me.Label28.Location = New System.Drawing.Point(41, 38)
-        Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(80, 13)
-        Me.Label28.TabIndex = 1
-        Me.Label28.Text = "Minimum speed"
-        '
-        'CbLookAhead
-        '
-        Me.CbLookAhead.AutoSize = True
-        Me.CbLookAhead.Checked = True
-        Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
-        Me.CbLookAhead.Name = "CbLookAhead"
-        Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
-        Me.CbLookAhead.TabIndex = 0
-        Me.CbLookAhead.Text = "Enabled"
-        Me.CbLookAhead.UseVisualStyleBackColor = True
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.PnEcoRoll)
-        Me.GroupBox1.Controls.Add(Me.RdEcoRoll)
-        Me.GroupBox1.Controls.Add(Me.RdOverspeed)
-        Me.GroupBox1.Controls.Add(Me.RdOff)
-        Me.GroupBox1.Location = New System.Drawing.Point(6, 149)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(515, 135)
-        Me.GroupBox1.TabIndex = 4
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Overspeed / Eco-Roll"
-        '
-        'PnEcoRoll
-        '
-        Me.PnEcoRoll.Controls.Add(Me.Label21)
-        Me.PnEcoRoll.Controls.Add(Me.Label20)
-        Me.PnEcoRoll.Controls.Add(Me.Label14)
-        Me.PnEcoRoll.Controls.Add(Me.TbVmin)
-        Me.PnEcoRoll.Controls.Add(Me.TbUnderSpeed)
-        Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
-        Me.PnEcoRoll.Controls.Add(Me.Label23)
-        Me.PnEcoRoll.Controls.Add(Me.Label22)
-        Me.PnEcoRoll.Controls.Add(Me.Label13)
-        Me.PnEcoRoll.Location = New System.Drawing.Point(137, 16)
-        Me.PnEcoRoll.Name = "PnEcoRoll"
-        Me.PnEcoRoll.Size = New System.Drawing.Size(232, 102)
-        Me.PnEcoRoll.TabIndex = 6
-        '
-        'Label21
-        '
-        Me.Label21.AutoSize = True
-        Me.Label21.Location = New System.Drawing.Point(178, 61)
-        Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(38, 13)
-        Me.Label21.TabIndex = 3
-        Me.Label21.Text = "[km/h]"
-        '
-        'Label20
-        '
-        Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(178, 35)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(38, 13)
-        Me.Label20.TabIndex = 3
-        Me.Label20.Text = "[km/h]"
-        '
-        'Label14
-        '
-        Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(178, 9)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(38, 13)
-        Me.Label14.TabIndex = 3
-        Me.Label14.Text = "[km/h]"
-        '
-        'TbVmin
-        '
-        Me.TbVmin.Location = New System.Drawing.Point(108, 58)
-        Me.TbVmin.Name = "TbVmin"
-        Me.TbVmin.Size = New System.Drawing.Size(64, 20)
-        Me.TbVmin.TabIndex = 5
-        '
-        'TbUnderSpeed
-        '
-        Me.TbUnderSpeed.Location = New System.Drawing.Point(108, 32)
-        Me.TbUnderSpeed.Name = "TbUnderSpeed"
-        Me.TbUnderSpeed.Size = New System.Drawing.Size(64, 20)
-        Me.TbUnderSpeed.TabIndex = 4
-        '
-        'TbOverspeed
-        '
-        Me.TbOverspeed.Location = New System.Drawing.Point(108, 6)
-        Me.TbOverspeed.Name = "TbOverspeed"
-        Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
-        Me.TbOverspeed.TabIndex = 3
-        '
-        'Label23
-        '
-        Me.Label23.AutoSize = True
-        Me.Label23.Location = New System.Drawing.Point(22, 61)
-        Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(80, 13)
-        Me.Label23.TabIndex = 1
-        Me.Label23.Text = "Minimum speed"
-        '
-        'Label22
-        '
-        Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(11, 35)
-        Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(91, 13)
-        Me.Label22.TabIndex = 1
-        Me.Label22.Text = "Max. Underspeed"
-        '
-        'Label13
-        '
-        Me.Label13.AutoSize = True
-        Me.Label13.Location = New System.Drawing.Point(17, 9)
-        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(85, 13)
-        Me.Label13.TabIndex = 1
-        Me.Label13.Text = "Max. Overspeed"
-        '
-        'RdEcoRoll
-        '
-        Me.RdEcoRoll.AutoSize = True
-        Me.RdEcoRoll.Checked = True
-        Me.RdEcoRoll.Location = New System.Drawing.Point(13, 68)
-        Me.RdEcoRoll.Name = "RdEcoRoll"
-        Me.RdEcoRoll.Size = New System.Drawing.Size(65, 17)
-        Me.RdEcoRoll.TabIndex = 2
-        Me.RdEcoRoll.TabStop = True
-        Me.RdEcoRoll.Text = "Eco-Roll"
-        Me.RdEcoRoll.UseVisualStyleBackColor = True
-        '
-        'RdOverspeed
-        '
-        Me.RdOverspeed.AutoSize = True
-        Me.RdOverspeed.Location = New System.Drawing.Point(13, 45)
-        Me.RdOverspeed.Name = "RdOverspeed"
-        Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
-        Me.RdOverspeed.TabIndex = 1
-        Me.RdOverspeed.Text = "Overspeed"
-        Me.RdOverspeed.UseVisualStyleBackColor = True
-        '
-        'RdOff
-        '
-        Me.RdOff.AutoSize = True
-        Me.RdOff.Location = New System.Drawing.Point(13, 22)
-        Me.RdOff.Name = "RdOff"
-        Me.RdOff.Size = New System.Drawing.Size(39, 17)
-        Me.RdOff.TabIndex = 0
-        Me.RdOff.Text = "Off"
-        Me.RdOff.UseVisualStyleBackColor = True
-        '
-        'GrStartStop
-        '
-        Me.GrStartStop.Controls.Add(Me.PnStartStop)
-        Me.GrStartStop.Controls.Add(Me.ChBStartStop)
-        Me.GrStartStop.Location = New System.Drawing.Point(6, 6)
-        Me.GrStartStop.Name = "GrStartStop"
-        Me.GrStartStop.Size = New System.Drawing.Size(515, 137)
-        Me.GrStartStop.TabIndex = 3
-        Me.GrStartStop.TabStop = False
-        Me.GrStartStop.Text = "Engine Start Stop"
-        '
-        'PnStartStop
-        '
-        Me.PnStartStop.Controls.Add(Me.Label31)
-        Me.PnStartStop.Controls.Add(Me.Label27)
-        Me.PnStartStop.Controls.Add(Me.TbSSspeed)
-        Me.PnStartStop.Controls.Add(Me.LabelSSspeed)
-        Me.PnStartStop.Controls.Add(Me.Label26)
-        Me.PnStartStop.Controls.Add(Me.Label30)
-        Me.PnStartStop.Controls.Add(Me.LabelSStime)
-        Me.PnStartStop.Controls.Add(Me.TbSSdelay)
-        Me.PnStartStop.Controls.Add(Me.TbSStime)
-        Me.PnStartStop.Location = New System.Drawing.Point(87, 21)
-        Me.PnStartStop.Name = "PnStartStop"
-        Me.PnStartStop.Size = New System.Drawing.Size(422, 95)
-        Me.PnStartStop.TabIndex = 1
-        '
-        'Label31
-        '
-        Me.Label31.AutoSize = True
-        Me.Label31.Location = New System.Drawing.Point(228, 58)
-        Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(18, 13)
-        Me.Label31.TabIndex = 38
-        Me.Label31.Text = "[s]"
-        '
-        'Label27
-        '
-        Me.Label27.AutoSize = True
-        Me.Label27.Location = New System.Drawing.Point(228, 32)
-        Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(18, 13)
-        Me.Label27.TabIndex = 38
-        Me.Label27.Text = "[s]"
-        '
-        'TbSSspeed
-        '
-        Me.TbSSspeed.Location = New System.Drawing.Point(158, 3)
-        Me.TbSSspeed.Name = "TbSSspeed"
-        Me.TbSSspeed.Size = New System.Drawing.Size(64, 20)
-        Me.TbSSspeed.TabIndex = 0
-        '
-        'LabelSSspeed
-        '
-        Me.LabelSSspeed.AutoSize = True
-        Me.LabelSSspeed.Location = New System.Drawing.Point(91, 6)
-        Me.LabelSSspeed.Name = "LabelSSspeed"
-        Me.LabelSSspeed.Size = New System.Drawing.Size(61, 13)
-        Me.LabelSSspeed.TabIndex = 37
-        Me.LabelSSspeed.Text = "Max Speed"
-        '
-        'Label26
-        '
-        Me.Label26.AutoSize = True
-        Me.Label26.Location = New System.Drawing.Point(228, 6)
-        Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(38, 13)
-        Me.Label26.TabIndex = 38
-        Me.Label26.Text = "[km/h]"
-        '
-        'Label30
-        '
-        Me.Label30.AutoSize = True
-        Me.Label30.Location = New System.Drawing.Point(68, 58)
-        Me.Label30.Name = "Label30"
-        Me.Label30.Size = New System.Drawing.Size(84, 13)
-        Me.Label30.TabIndex = 35
-        Me.Label30.Text = "Activation Delay"
-        '
-        'LabelSStime
-        '
-        Me.LabelSStime.AutoSize = True
-        Me.LabelSStime.Location = New System.Drawing.Point(65, 32)
-        Me.LabelSStime.Name = "LabelSStime"
-        Me.LabelSStime.Size = New System.Drawing.Size(87, 13)
-        Me.LabelSStime.TabIndex = 35
-        Me.LabelSStime.Text = "Min ICE-On Time"
-        '
-        'TbSSdelay
-        '
-        Me.TbSSdelay.Location = New System.Drawing.Point(158, 55)
-        Me.TbSSdelay.Name = "TbSSdelay"
-        Me.TbSSdelay.Size = New System.Drawing.Size(64, 20)
-        Me.TbSSdelay.TabIndex = 1
-        '
-        'TbSStime
-        '
-        Me.TbSStime.Location = New System.Drawing.Point(158, 29)
-        Me.TbSStime.Name = "TbSStime"
-        Me.TbSStime.Size = New System.Drawing.Size(64, 20)
-        Me.TbSStime.TabIndex = 1
-        '
-        'ChBStartStop
-        '
-        Me.ChBStartStop.AutoSize = True
-        Me.ChBStartStop.Checked = True
-        Me.ChBStartStop.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.ChBStartStop.Location = New System.Drawing.Point(16, 21)
-        Me.ChBStartStop.Name = "ChBStartStop"
-        Me.ChBStartStop.Size = New System.Drawing.Size(65, 17)
-        Me.ChBStartStop.TabIndex = 0
-        Me.ChBStartStop.Text = "Enabled"
-        Me.ChBStartStop.UseVisualStyleBackColor = True
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 627)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
-        Me.StatusStrip1.SizingGrip = False
-        Me.StatusStrip1.TabIndex = 6
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'ToolStripStatusLabelGEN
-        '
-        Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
-        Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(121, 17)
-        Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
-        '
-        'ButOK
-        '
-        Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButOK.Location = New System.Drawing.Point(779, 601)
-        Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 11
-        Me.ButOK.Text = "Save"
-        Me.ButOK.UseVisualStyleBackColor = True
-        '
-        'ButCancel
-        '
-        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.ButCancel.Location = New System.Drawing.Point(860, 601)
-        Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 19
-        Me.ButCancel.Text = "Cancel"
-        Me.ButCancel.UseVisualStyleBackColor = True
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(944, 25)
-        Me.ToolStrip1.TabIndex = 20
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripBtNew
-        '
-        Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
-        Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtNew.Text = "New"
-        Me.ToolStripBtNew.ToolTipText = "New"
-        '
-        'ToolStripBtOpen
-        '
-        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
-        Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtOpen.Text = "Open"
-        Me.ToolStripBtOpen.ToolTipText = "Open..."
-        '
-        'ToolStripBtSave
-        '
-        Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
-        Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSave.Text = "Save"
-        Me.ToolStripBtSave.ToolTipText = "Save"
-        '
-        'ToolStripBtSaveAs
-        '
-        Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
-        Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSaveAs.Text = "Save As"
-        Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripBtSendTo
-        '
-        Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
-        Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtSendTo.Text = "Send to Job List"
-        Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
-        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton1.Text = "Help"
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.BackColor = System.Drawing.Color.White
-        Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_VECTO
-        Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(920, 40)
-        Me.PictureBox1.TabIndex = 21
-        Me.PictureBox1.TabStop = False
-        '
-        'CbEngOnly
-        '
-        Me.CbEngOnly.AutoSize = True
-        Me.CbEngOnly.Location = New System.Drawing.Point(17, 84)
-        Me.CbEngOnly.Name = "CbEngOnly"
-        Me.CbEngOnly.Size = New System.Drawing.Size(113, 17)
-        Me.CbEngOnly.TabIndex = 35
-        Me.CbEngOnly.Text = "Engine Only Mode"
-        Me.CbEngOnly.UseVisualStyleBackColor = True
-        '
-        'CmOpenFile
-        '
-        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-        Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
-        '
-        'OpenWithToolStripMenuItem
-        '
-        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-        '
-        'ShowInFolderToolStripMenuItem
-        '
-        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-        '
-        'PicVehicle
-        '
-        Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
-        Me.PicVehicle.Location = New System.Drawing.Point(542, 122)
-        Me.PicVehicle.Name = "PicVehicle"
-        Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
-        Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-        Me.PicVehicle.TabIndex = 36
-        Me.PicVehicle.TabStop = False
-        '
-        'PicBox
-        '
-        Me.PicBox.BackColor = System.Drawing.Color.LightGray
-        Me.PicBox.Location = New System.Drawing.Point(542, 268)
-        Me.PicBox.Name = "PicBox"
-        Me.PicBox.Size = New System.Drawing.Size(390, 327)
-        Me.PicBox.TabIndex = 36
-        Me.PicBox.TabStop = False
-        '
-        'TbEngTxt
-        '
-        Me.TbEngTxt.Location = New System.Drawing.Point(542, 216)
-        Me.TbEngTxt.Name = "TbEngTxt"
-        Me.TbEngTxt.ReadOnly = True
-        Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
-        Me.TbEngTxt.TabIndex = 37
-        '
-        'TbVehCat
-        '
-        Me.TbVehCat.Location = New System.Drawing.Point(848, 126)
-        Me.TbVehCat.Name = "TbVehCat"
-        Me.TbVehCat.ReadOnly = True
-        Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
-        Me.TbVehCat.TabIndex = 37
-        '
-        'TbAxleConf
-        '
-        Me.TbAxleConf.Location = New System.Drawing.Point(904, 155)
-        Me.TbAxleConf.Name = "TbAxleConf"
-        Me.TbAxleConf.ReadOnly = True
-        Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
-        Me.TbAxleConf.TabIndex = 37
-        '
-        'TbHVCclass
-        '
-        Me.TbHVCclass.Location = New System.Drawing.Point(848, 184)
-        Me.TbHVCclass.Name = "TbHVCclass"
-        Me.TbHVCclass.ReadOnly = True
-        Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
-        Me.TbHVCclass.TabIndex = 37
-        '
-        'TbGbxTxt
-        '
-        Me.TbGbxTxt.Location = New System.Drawing.Point(542, 242)
-        Me.TbGbxTxt.Name = "TbGbxTxt"
-        Me.TbGbxTxt.ReadOnly = True
-        Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
-        Me.TbGbxTxt.TabIndex = 37
-        '
-        'TbMass
-        '
-        Me.TbMass.Location = New System.Drawing.Point(848, 155)
-        Me.TbMass.Name = "TbMass"
-        Me.TbMass.ReadOnly = True
-        Me.TbMass.Size = New System.Drawing.Size(50, 20)
-        Me.TbMass.TabIndex = 37
-        '
-        'F_VECTO
-        '
-        Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(944, 649)
-        Me.Controls.Add(Me.TbHVCclass)
-        Me.Controls.Add(Me.TbMass)
-        Me.Controls.Add(Me.TbAxleConf)
-        Me.Controls.Add(Me.TbVehCat)
-        Me.Controls.Add(Me.TbGbxTxt)
-        Me.Controls.Add(Me.TbEngTxt)
-        Me.Controls.Add(Me.PicBox)
-        Me.Controls.Add(Me.PicVehicle)
-        Me.Controls.Add(Me.CbEngOnly)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.ButCancel)
-        Me.Controls.Add(Me.TabControl1)
-        Me.Controls.Add(Me.ButOK)
-        Me.Controls.Add(Me.StatusStrip1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
-        Me.Name = "F_VECTO"
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "Job Editor"
-        Me.TabPgGen.ResumeLayout(False)
-        Me.TabPgGen.PerformLayout()
-        Me.GrCycles.ResumeLayout(False)
-        Me.GrCycles.PerformLayout()
-        Me.GrAux.ResumeLayout(False)
-        Me.GrAux.PerformLayout()
-        Me.TabControl1.ResumeLayout(False)
-        Me.TabPgDriver.ResumeLayout(False)
-        Me.GrVACC.ResumeLayout(False)
-        Me.GrVACC.PerformLayout()
-        Me.GrLAC.ResumeLayout(False)
-        Me.GrLAC.PerformLayout()
-        Me.PnLookAhead.ResumeLayout(False)
-        Me.PnLookAhead.PerformLayout()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
-        Me.PnEcoRoll.ResumeLayout(False)
-        Me.PnEcoRoll.PerformLayout()
-        Me.GrStartStop.ResumeLayout(False)
-        Me.GrStartStop.PerformLayout()
-        Me.PnStartStop.ResumeLayout(False)
-        Me.PnStartStop.PerformLayout()
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.CmOpenFile.ResumeLayout(False)
-        CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+		Me.components = New System.ComponentModel.Container()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_VECTO))
+		Me.TabPgGen = New System.Windows.Forms.TabPage()
+		Me.GrCycles = New System.Windows.Forms.GroupBox()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.LvCycles = New System.Windows.Forms.ListView()
+		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.BtDRIrem = New System.Windows.Forms.Button()
+		Me.BtDRIadd = New System.Windows.Forms.Button()
+		Me.GrAux = New System.Windows.Forms.GroupBox()
+		Me.Label32 = New System.Windows.Forms.Label()
+		Me.LvAux = New System.Windows.Forms.ListView()
+		Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ButAuxRem = New System.Windows.Forms.Button()
+		Me.ButAuxAdd = New System.Windows.Forms.Button()
+		Me.TbGBX = New System.Windows.Forms.TextBox()
+		Me.TbENG = New System.Windows.Forms.TextBox()
+		Me.TbVEH = New System.Windows.Forms.TextBox()
+		Me.ButOpenGBX = New System.Windows.Forms.Button()
+		Me.ButOpenENG = New System.Windows.Forms.Button()
+		Me.ButOpenVEH = New System.Windows.Forms.Button()
+		Me.ButtonVEH = New System.Windows.Forms.Button()
+		Me.ButtonGBX = New System.Windows.Forms.Button()
+		Me.ButtonMAP = New System.Windows.Forms.Button()
+		Me.TabControl1 = New System.Windows.Forms.TabControl()
+		Me.TabPgDriver = New System.Windows.Forms.TabPage()
+		Me.GrVACC = New System.Windows.Forms.GroupBox()
+		Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
+		Me.BtDesMaxBr = New System.Windows.Forms.Button()
+		Me.BtAccOpen = New System.Windows.Forms.Button()
+		Me.GrLAC = New System.Windows.Forms.GroupBox()
+		Me.PnLookAhead = New System.Windows.Forms.Panel()
+		Me.Label29 = New System.Windows.Forms.Label()
+		Me.Label25 = New System.Windows.Forms.Label()
+		Me.TbAlookahead = New System.Windows.Forms.TextBox()
+		Me.Label24 = New System.Windows.Forms.Label()
+		Me.TbVminLA = New System.Windows.Forms.TextBox()
+		Me.Label28 = New System.Windows.Forms.Label()
+		Me.CbLookAhead = New System.Windows.Forms.CheckBox()
+		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+		Me.PnEcoRoll = New System.Windows.Forms.Panel()
+		Me.Label21 = New System.Windows.Forms.Label()
+		Me.Label20 = New System.Windows.Forms.Label()
+		Me.Label14 = New System.Windows.Forms.Label()
+		Me.TbVmin = New System.Windows.Forms.TextBox()
+		Me.TbUnderSpeed = New System.Windows.Forms.TextBox()
+		Me.TbOverspeed = New System.Windows.Forms.TextBox()
+		Me.Label23 = New System.Windows.Forms.Label()
+		Me.Label22 = New System.Windows.Forms.Label()
+		Me.Label13 = New System.Windows.Forms.Label()
+		Me.RdEcoRoll = New System.Windows.Forms.RadioButton()
+		Me.RdOverspeed = New System.Windows.Forms.RadioButton()
+		Me.RdOff = New System.Windows.Forms.RadioButton()
+		Me.GrStartStop = New System.Windows.Forms.GroupBox()
+		Me.PnStartStop = New System.Windows.Forms.Panel()
+		Me.Label31 = New System.Windows.Forms.Label()
+		Me.Label27 = New System.Windows.Forms.Label()
+		Me.TbSSspeed = New System.Windows.Forms.TextBox()
+		Me.LabelSSspeed = New System.Windows.Forms.Label()
+		Me.Label26 = New System.Windows.Forms.Label()
+		Me.Label30 = New System.Windows.Forms.Label()
+		Me.LabelSStime = New System.Windows.Forms.Label()
+		Me.TbSSdelay = New System.Windows.Forms.TextBox()
+		Me.TbSStime = New System.Windows.Forms.TextBox()
+		Me.ChBStartStop = New System.Windows.Forms.CheckBox()
+		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+		Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel()
+		Me.ButOK = New System.Windows.Forms.Button()
+		Me.ButCancel = New System.Windows.Forms.Button()
+		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+		Me.CbEngOnly = New System.Windows.Forms.CheckBox()
+		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.PicVehicle = New System.Windows.Forms.PictureBox()
+		Me.PicBox = New System.Windows.Forms.PictureBox()
+		Me.TbEngTxt = New System.Windows.Forms.TextBox()
+		Me.TbVehCat = New System.Windows.Forms.TextBox()
+		Me.TbAxleConf = New System.Windows.Forms.TextBox()
+		Me.TbHVCclass = New System.Windows.Forms.TextBox()
+		Me.TbGbxTxt = New System.Windows.Forms.TextBox()
+		Me.TbMass = New System.Windows.Forms.TextBox()
+		Me.TabPgGen.SuspendLayout()
+		Me.GrCycles.SuspendLayout()
+		Me.GrAux.SuspendLayout()
+		Me.TabControl1.SuspendLayout()
+		Me.TabPgDriver.SuspendLayout()
+		Me.GrVACC.SuspendLayout()
+		Me.GrLAC.SuspendLayout()
+		Me.PnLookAhead.SuspendLayout()
+		Me.GroupBox1.SuspendLayout()
+		Me.PnEcoRoll.SuspendLayout()
+		Me.GrStartStop.SuspendLayout()
+		Me.PnStartStop.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		Me.ToolStrip1.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.CmOpenFile.SuspendLayout()
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.SuspendLayout()
+		'
+		'TabPgGen
+		'
+		Me.TabPgGen.Controls.Add(Me.GrCycles)
+		Me.TabPgGen.Controls.Add(Me.GrAux)
+		Me.TabPgGen.Controls.Add(Me.TbGBX)
+		Me.TabPgGen.Controls.Add(Me.TbENG)
+		Me.TabPgGen.Controls.Add(Me.TbVEH)
+		Me.TabPgGen.Controls.Add(Me.ButOpenGBX)
+		Me.TabPgGen.Controls.Add(Me.ButOpenENG)
+		Me.TabPgGen.Controls.Add(Me.ButOpenVEH)
+		Me.TabPgGen.Controls.Add(Me.ButtonVEH)
+		Me.TabPgGen.Controls.Add(Me.ButtonGBX)
+		Me.TabPgGen.Controls.Add(Me.ButtonMAP)
+		Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
+		Me.TabPgGen.Name = "TabPgGen"
+		Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
+		Me.TabPgGen.Size = New System.Drawing.Size(527, 491)
+		Me.TabPgGen.TabIndex = 0
+		Me.TabPgGen.Text = "General"
+		Me.TabPgGen.UseVisualStyleBackColor = True
+		'
+		'GrCycles
+		'
+		Me.GrCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.GrCycles.Controls.Add(Me.Label2)
+		Me.GrCycles.Controls.Add(Me.LvCycles)
+		Me.GrCycles.Controls.Add(Me.BtDRIrem)
+		Me.GrCycles.Controls.Add(Me.BtDRIadd)
+		Me.GrCycles.Location = New System.Drawing.Point(7, 271)
+		Me.GrCycles.Name = "GrCycles"
+		Me.GrCycles.Size = New System.Drawing.Size(515, 208)
+		Me.GrCycles.TabIndex = 10
+		Me.GrCycles.TabStop = False
+		Me.GrCycles.Text = "Cycles"
+		'
+		'Label2
+		'
+		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(387, 153)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(122, 13)
+		Me.Label2.TabIndex = 3
+		Me.Label2.Text = "Double-Click to open file"
+		'
+		'LvCycles
+		'
+		Me.LvCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
+		Me.LvCycles.FullRowSelect = True
+		Me.LvCycles.GridLines = True
+		Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
+		Me.LvCycles.HideSelection = False
+		Me.LvCycles.LabelEdit = True
+		Me.LvCycles.Location = New System.Drawing.Point(6, 19)
+		Me.LvCycles.MultiSelect = False
+		Me.LvCycles.Name = "LvCycles"
+		Me.LvCycles.Size = New System.Drawing.Size(503, 123)
+		Me.LvCycles.TabIndex = 0
+		Me.LvCycles.TabStop = False
+		Me.LvCycles.UseCompatibleStateImageBehavior = False
+		Me.LvCycles.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader1
+		'
+		Me.ColumnHeader1.Text = "Cycle path"
+		Me.ColumnHeader1.Width = 470
+		'
+		'BtDRIrem
+		'
+		Me.BtDRIrem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtDRIrem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtDRIrem.Location = New System.Drawing.Point(41, 148)
+		Me.BtDRIrem.Name = "BtDRIrem"
+		Me.BtDRIrem.Size = New System.Drawing.Size(29, 23)
+		Me.BtDRIrem.TabIndex = 2
+		Me.BtDRIrem.UseVisualStyleBackColor = True
+		'
+		'BtDRIadd
+		'
+		Me.BtDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtDRIadd.Location = New System.Drawing.Point(6, 148)
+		Me.BtDRIadd.Name = "BtDRIadd"
+		Me.BtDRIadd.Size = New System.Drawing.Size(29, 23)
+		Me.BtDRIadd.TabIndex = 1
+		Me.BtDRIadd.UseVisualStyleBackColor = True
+		'
+		'GrAux
+		'
+		Me.GrAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.GrAux.Controls.Add(Me.Label32)
+		Me.GrAux.Controls.Add(Me.LvAux)
+		Me.GrAux.Controls.Add(Me.ButAuxRem)
+		Me.GrAux.Controls.Add(Me.ButAuxAdd)
+		Me.GrAux.Location = New System.Drawing.Point(6, 87)
+		Me.GrAux.Name = "GrAux"
+		Me.GrAux.Size = New System.Drawing.Size(515, 209)
+		Me.GrAux.TabIndex = 9
+		Me.GrAux.TabStop = False
+		Me.GrAux.Text = "Auxiliaries"
+		'
+		'Label32
+		'
+		Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label32.AutoSize = True
+		Me.Label32.Location = New System.Drawing.Point(369, 147)
+		Me.Label32.Name = "Label32"
+		Me.Label32.Size = New System.Drawing.Size(139, 13)
+		Me.Label32.TabIndex = 3
+		Me.Label32.Text = "Double-Click to edit auxiliary"
+		'
+		'LvAux
+		'
+		Me.LvAux.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
+		Me.LvAux.FullRowSelect = True
+		Me.LvAux.GridLines = True
+		Me.LvAux.HideSelection = False
+		Me.LvAux.Location = New System.Drawing.Point(6, 19)
+		Me.LvAux.MultiSelect = False
+		Me.LvAux.Name = "LvAux"
+		Me.LvAux.Size = New System.Drawing.Size(503, 117)
+		Me.LvAux.TabIndex = 0
+		Me.LvAux.TabStop = False
+		Me.LvAux.UseCompatibleStateImageBehavior = False
+		Me.LvAux.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader4
+		'
+		Me.ColumnHeader4.Text = "ID"
+		Me.ColumnHeader4.Width = 45
+		'
+		'ColumnHeader5
+		'
+		Me.ColumnHeader5.Text = "Type"
+		Me.ColumnHeader5.Width = 108
+		'
+		'ColumnHeader6
+		'
+		Me.ColumnHeader6.Text = "Input File"
+		Me.ColumnHeader6.Width = 331
+		'
+		'ButAuxRem
+		'
+		Me.ButAuxRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.ButAuxRem.Location = New System.Drawing.Point(42, 142)
+		Me.ButAuxRem.Name = "ButAuxRem"
+		Me.ButAuxRem.Size = New System.Drawing.Size(29, 23)
+		Me.ButAuxRem.TabIndex = 2
+		Me.ButAuxRem.UseVisualStyleBackColor = True
+		'
+		'ButAuxAdd
+		'
+		Me.ButAuxAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.ButAuxAdd.Location = New System.Drawing.Point(7, 142)
+		Me.ButAuxAdd.Name = "ButAuxAdd"
+		Me.ButAuxAdd.Size = New System.Drawing.Size(29, 23)
+		Me.ButAuxAdd.TabIndex = 1
+		Me.ButAuxAdd.UseVisualStyleBackColor = True
+		'
+		'TbGBX
+		'
+		Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbGBX.Location = New System.Drawing.Point(84, 60)
+		Me.TbGBX.Name = "TbGBX"
+		Me.TbGBX.Size = New System.Drawing.Size(406, 20)
+		Me.TbGBX.TabIndex = 7
+		'
+		'TbENG
+		'
+		Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbENG.Location = New System.Drawing.Point(84, 33)
+		Me.TbENG.Name = "TbENG"
+		Me.TbENG.Size = New System.Drawing.Size(406, 20)
+		Me.TbENG.TabIndex = 4
+		'
+		'TbVEH
+		'
+		Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbVEH.Location = New System.Drawing.Point(84, 7)
+		Me.TbVEH.Name = "TbVEH"
+		Me.TbVEH.Size = New System.Drawing.Size(406, 20)
+		Me.TbVEH.TabIndex = 1
+		'
+		'ButOpenGBX
+		'
+		Me.ButOpenGBX.Location = New System.Drawing.Point(6, 60)
+		Me.ButOpenGBX.Name = "ButOpenGBX"
+		Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
+		Me.ButOpenGBX.TabIndex = 6
+		Me.ButOpenGBX.TabStop = False
+		Me.ButOpenGBX.Text = "Gearbox"
+		Me.ButOpenGBX.UseVisualStyleBackColor = True
+		'
+		'ButOpenENG
+		'
+		Me.ButOpenENG.Location = New System.Drawing.Point(6, 33)
+		Me.ButOpenENG.Name = "ButOpenENG"
+		Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
+		Me.ButOpenENG.TabIndex = 3
+		Me.ButOpenENG.TabStop = False
+		Me.ButOpenENG.Text = "Engine"
+		Me.ButOpenENG.UseVisualStyleBackColor = True
+		'
+		'ButOpenVEH
+		'
+		Me.ButOpenVEH.Location = New System.Drawing.Point(6, 6)
+		Me.ButOpenVEH.Name = "ButOpenVEH"
+		Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
+		Me.ButOpenVEH.TabIndex = 0
+		Me.ButOpenVEH.TabStop = False
+		Me.ButOpenVEH.Text = "Vehicle"
+		Me.ButOpenVEH.UseVisualStyleBackColor = True
+		'
+		'ButtonVEH
+		'
+		Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButtonVEH.Location = New System.Drawing.Point(496, 6)
+		Me.ButtonVEH.Name = "ButtonVEH"
+		Me.ButtonVEH.Size = New System.Drawing.Size(28, 21)
+		Me.ButtonVEH.TabIndex = 2
+		Me.ButtonVEH.TabStop = False
+		Me.ButtonVEH.Text = "..."
+		Me.ButtonVEH.UseVisualStyleBackColor = True
+		'
+		'ButtonGBX
+		'
+		Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButtonGBX.Location = New System.Drawing.Point(496, 60)
+		Me.ButtonGBX.Name = "ButtonGBX"
+		Me.ButtonGBX.Size = New System.Drawing.Size(28, 21)
+		Me.ButtonGBX.TabIndex = 8
+		Me.ButtonGBX.TabStop = False
+		Me.ButtonGBX.Text = "..."
+		Me.ButtonGBX.UseVisualStyleBackColor = True
+		'
+		'ButtonMAP
+		'
+		Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButtonMAP.Location = New System.Drawing.Point(496, 33)
+		Me.ButtonMAP.Name = "ButtonMAP"
+		Me.ButtonMAP.Size = New System.Drawing.Size(28, 21)
+		Me.ButtonMAP.TabIndex = 5
+		Me.ButtonMAP.TabStop = False
+		Me.ButtonMAP.Text = "..."
+		Me.ButtonMAP.UseVisualStyleBackColor = True
+		'
+		'TabControl1
+		'
+		Me.TabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TabControl1.Controls.Add(Me.TabPgGen)
+		Me.TabControl1.Controls.Add(Me.TabPgDriver)
+		Me.TabControl1.Location = New System.Drawing.Point(1, 107)
+		Me.TabControl1.Name = "TabControl1"
+		Me.TabControl1.SelectedIndex = 0
+		Me.TabControl1.Size = New System.Drawing.Size(535, 517)
+		Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
+		Me.TabControl1.TabIndex = 0
+		'
+		'TabPgDriver
+		'
+		Me.TabPgDriver.Controls.Add(Me.GrVACC)
+		Me.TabPgDriver.Controls.Add(Me.GrLAC)
+		Me.TabPgDriver.Controls.Add(Me.GroupBox1)
+		Me.TabPgDriver.Controls.Add(Me.GrStartStop)
+		Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
+		Me.TabPgDriver.Name = "TabPgDriver"
+		Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
+		Me.TabPgDriver.Size = New System.Drawing.Size(527, 491)
+		Me.TabPgDriver.TabIndex = 7
+		Me.TabPgDriver.Text = "Driver Assist"
+		Me.TabPgDriver.UseVisualStyleBackColor = True
+		'
+		'GrVACC
+		'
+		Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
+		Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
+		Me.GrVACC.Controls.Add(Me.BtAccOpen)
+		Me.GrVACC.Location = New System.Drawing.Point(6, 401)
+		Me.GrVACC.Name = "GrVACC"
+		Me.GrVACC.Size = New System.Drawing.Size(515, 84)
+		Me.GrVACC.TabIndex = 3
+		Me.GrVACC.TabStop = False
+		Me.GrVACC.Text = "Max. acceleration and brake curves"
+		'
+		'TbDesMaxFile
+		'
+		Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 29)
+		Me.TbDesMaxFile.Name = "TbDesMaxFile"
+		Me.TbDesMaxFile.Size = New System.Drawing.Size(440, 20)
+		Me.TbDesMaxFile.TabIndex = 0
+		'
+		'BtDesMaxBr
+		'
+		Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtDesMaxBr.Location = New System.Drawing.Point(452, 28)
+		Me.BtDesMaxBr.Name = "BtDesMaxBr"
+		Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 21)
+		Me.BtDesMaxBr.TabIndex = 1
+		Me.BtDesMaxBr.Text = "..."
+		Me.BtDesMaxBr.UseVisualStyleBackColor = True
+		'
+		'BtAccOpen
+		'
+		Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtAccOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+		Me.BtAccOpen.Location = New System.Drawing.Point(486, 27)
+		Me.BtAccOpen.Name = "BtAccOpen"
+		Me.BtAccOpen.Size = New System.Drawing.Size(23, 23)
+		Me.BtAccOpen.TabIndex = 2
+		Me.BtAccOpen.TabStop = False
+		Me.BtAccOpen.UseVisualStyleBackColor = True
+		'
+		'GrLAC
+		'
+		Me.GrLAC.Controls.Add(Me.PnLookAhead)
+		Me.GrLAC.Controls.Add(Me.CbLookAhead)
+		Me.GrLAC.Location = New System.Drawing.Point(7, 290)
+		Me.GrLAC.Name = "GrLAC"
+		Me.GrLAC.Size = New System.Drawing.Size(514, 105)
+		Me.GrLAC.TabIndex = 2
+		Me.GrLAC.TabStop = False
+		Me.GrLAC.Text = "Look-Ahead Coasting"
+		'
+		'PnLookAhead
+		'
+		Me.PnLookAhead.Controls.Add(Me.Label29)
+		Me.PnLookAhead.Controls.Add(Me.Label25)
+		Me.PnLookAhead.Controls.Add(Me.TbAlookahead)
+		Me.PnLookAhead.Controls.Add(Me.Label24)
+		Me.PnLookAhead.Controls.Add(Me.TbVminLA)
+		Me.PnLookAhead.Controls.Add(Me.Label28)
+		Me.PnLookAhead.Location = New System.Drawing.Point(117, 10)
+		Me.PnLookAhead.Name = "PnLookAhead"
+		Me.PnLookAhead.Size = New System.Drawing.Size(252, 71)
+		Me.PnLookAhead.TabIndex = 1
+		'
+		'Label29
+		'
+		Me.Label29.AutoSize = True
+		Me.Label29.Location = New System.Drawing.Point(197, 38)
+		Me.Label29.Name = "Label29"
+		Me.Label29.Size = New System.Drawing.Size(38, 13)
+		Me.Label29.TabIndex = 3
+		Me.Label29.Text = "[km/h]"
+		'
+		'Label25
+		'
+		Me.Label25.AutoSize = True
+		Me.Label25.Location = New System.Drawing.Point(197, 12)
+		Me.Label25.Name = "Label25"
+		Me.Label25.Size = New System.Drawing.Size(34, 13)
+		Me.Label25.TabIndex = 3
+		Me.Label25.Text = "[m/s²]"
+		'
+		'TbAlookahead
+		'
+		Me.TbAlookahead.Location = New System.Drawing.Point(127, 9)
+		Me.TbAlookahead.Name = "TbAlookahead"
+		Me.TbAlookahead.Size = New System.Drawing.Size(64, 20)
+		Me.TbAlookahead.TabIndex = 0
+		'
+		'Label24
+		'
+		Me.Label24.AutoSize = True
+		Me.Label24.Location = New System.Drawing.Point(25, 12)
+		Me.Label24.Name = "Label24"
+		Me.Label24.Size = New System.Drawing.Size(96, 13)
+		Me.Label24.TabIndex = 1
+		Me.Label24.Text = "Target Retardation"
+		'
+		'TbVminLA
+		'
+		Me.TbVminLA.Location = New System.Drawing.Point(127, 35)
+		Me.TbVminLA.Name = "TbVminLA"
+		Me.TbVminLA.Size = New System.Drawing.Size(64, 20)
+		Me.TbVminLA.TabIndex = 1
+		'
+		'Label28
+		'
+		Me.Label28.AutoSize = True
+		Me.Label28.Location = New System.Drawing.Point(41, 38)
+		Me.Label28.Name = "Label28"
+		Me.Label28.Size = New System.Drawing.Size(80, 13)
+		Me.Label28.TabIndex = 1
+		Me.Label28.Text = "Minimum speed"
+		'
+		'CbLookAhead
+		'
+		Me.CbLookAhead.AutoSize = True
+		Me.CbLookAhead.Checked = True
+		Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
+		Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
+		Me.CbLookAhead.Name = "CbLookAhead"
+		Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
+		Me.CbLookAhead.TabIndex = 0
+		Me.CbLookAhead.Text = "Enabled"
+		Me.CbLookAhead.UseVisualStyleBackColor = True
+		'
+		'GroupBox1
+		'
+		Me.GroupBox1.Controls.Add(Me.PnEcoRoll)
+		Me.GroupBox1.Controls.Add(Me.RdEcoRoll)
+		Me.GroupBox1.Controls.Add(Me.RdOverspeed)
+		Me.GroupBox1.Controls.Add(Me.RdOff)
+		Me.GroupBox1.Location = New System.Drawing.Point(6, 149)
+		Me.GroupBox1.Name = "GroupBox1"
+		Me.GroupBox1.Size = New System.Drawing.Size(515, 135)
+		Me.GroupBox1.TabIndex = 1
+		Me.GroupBox1.TabStop = False
+		Me.GroupBox1.Text = "Overspeed / Eco-Roll"
+		'
+		'PnEcoRoll
+		'
+		Me.PnEcoRoll.Controls.Add(Me.Label21)
+		Me.PnEcoRoll.Controls.Add(Me.Label20)
+		Me.PnEcoRoll.Controls.Add(Me.Label14)
+		Me.PnEcoRoll.Controls.Add(Me.TbVmin)
+		Me.PnEcoRoll.Controls.Add(Me.TbUnderSpeed)
+		Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
+		Me.PnEcoRoll.Controls.Add(Me.Label23)
+		Me.PnEcoRoll.Controls.Add(Me.Label22)
+		Me.PnEcoRoll.Controls.Add(Me.Label13)
+		Me.PnEcoRoll.Location = New System.Drawing.Point(137, 16)
+		Me.PnEcoRoll.Name = "PnEcoRoll"
+		Me.PnEcoRoll.Size = New System.Drawing.Size(232, 102)
+		Me.PnEcoRoll.TabIndex = 3
+		'
+		'Label21
+		'
+		Me.Label21.AutoSize = True
+		Me.Label21.Location = New System.Drawing.Point(178, 61)
+		Me.Label21.Name = "Label21"
+		Me.Label21.Size = New System.Drawing.Size(38, 13)
+		Me.Label21.TabIndex = 3
+		Me.Label21.Text = "[km/h]"
+		'
+		'Label20
+		'
+		Me.Label20.AutoSize = True
+		Me.Label20.Location = New System.Drawing.Point(178, 35)
+		Me.Label20.Name = "Label20"
+		Me.Label20.Size = New System.Drawing.Size(38, 13)
+		Me.Label20.TabIndex = 3
+		Me.Label20.Text = "[km/h]"
+		'
+		'Label14
+		'
+		Me.Label14.AutoSize = True
+		Me.Label14.Location = New System.Drawing.Point(178, 9)
+		Me.Label14.Name = "Label14"
+		Me.Label14.Size = New System.Drawing.Size(38, 13)
+		Me.Label14.TabIndex = 3
+		Me.Label14.Text = "[km/h]"
+		'
+		'TbVmin
+		'
+		Me.TbVmin.Location = New System.Drawing.Point(108, 58)
+		Me.TbVmin.Name = "TbVmin"
+		Me.TbVmin.Size = New System.Drawing.Size(64, 20)
+		Me.TbVmin.TabIndex = 2
+		'
+		'TbUnderSpeed
+		'
+		Me.TbUnderSpeed.Location = New System.Drawing.Point(108, 32)
+		Me.TbUnderSpeed.Name = "TbUnderSpeed"
+		Me.TbUnderSpeed.Size = New System.Drawing.Size(64, 20)
+		Me.TbUnderSpeed.TabIndex = 1
+		'
+		'TbOverspeed
+		'
+		Me.TbOverspeed.Location = New System.Drawing.Point(108, 6)
+		Me.TbOverspeed.Name = "TbOverspeed"
+		Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
+		Me.TbOverspeed.TabIndex = 0
+		'
+		'Label23
+		'
+		Me.Label23.AutoSize = True
+		Me.Label23.Location = New System.Drawing.Point(22, 61)
+		Me.Label23.Name = "Label23"
+		Me.Label23.Size = New System.Drawing.Size(80, 13)
+		Me.Label23.TabIndex = 1
+		Me.Label23.Text = "Minimum speed"
+		'
+		'Label22
+		'
+		Me.Label22.AutoSize = True
+		Me.Label22.Location = New System.Drawing.Point(11, 35)
+		Me.Label22.Name = "Label22"
+		Me.Label22.Size = New System.Drawing.Size(91, 13)
+		Me.Label22.TabIndex = 1
+		Me.Label22.Text = "Max. Underspeed"
+		'
+		'Label13
+		'
+		Me.Label13.AutoSize = True
+		Me.Label13.Location = New System.Drawing.Point(17, 9)
+		Me.Label13.Name = "Label13"
+		Me.Label13.Size = New System.Drawing.Size(85, 13)
+		Me.Label13.TabIndex = 1
+		Me.Label13.Text = "Max. Overspeed"
+		'
+		'RdEcoRoll
+		'
+		Me.RdEcoRoll.AutoSize = True
+		Me.RdEcoRoll.Checked = True
+		Me.RdEcoRoll.Location = New System.Drawing.Point(13, 68)
+		Me.RdEcoRoll.Name = "RdEcoRoll"
+		Me.RdEcoRoll.Size = New System.Drawing.Size(65, 17)
+		Me.RdEcoRoll.TabIndex = 2
+		Me.RdEcoRoll.TabStop = True
+		Me.RdEcoRoll.Text = "Eco-Roll"
+		Me.RdEcoRoll.UseVisualStyleBackColor = True
+		'
+		'RdOverspeed
+		'
+		Me.RdOverspeed.AutoSize = True
+		Me.RdOverspeed.Location = New System.Drawing.Point(13, 45)
+		Me.RdOverspeed.Name = "RdOverspeed"
+		Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
+		Me.RdOverspeed.TabIndex = 1
+		Me.RdOverspeed.Text = "Overspeed"
+		Me.RdOverspeed.UseVisualStyleBackColor = True
+		'
+		'RdOff
+		'
+		Me.RdOff.AutoSize = True
+		Me.RdOff.Location = New System.Drawing.Point(13, 22)
+		Me.RdOff.Name = "RdOff"
+		Me.RdOff.Size = New System.Drawing.Size(39, 17)
+		Me.RdOff.TabIndex = 0
+		Me.RdOff.Text = "Off"
+		Me.RdOff.UseVisualStyleBackColor = True
+		'
+		'GrStartStop
+		'
+		Me.GrStartStop.Controls.Add(Me.PnStartStop)
+		Me.GrStartStop.Controls.Add(Me.ChBStartStop)
+		Me.GrStartStop.Location = New System.Drawing.Point(6, 6)
+		Me.GrStartStop.Name = "GrStartStop"
+		Me.GrStartStop.Size = New System.Drawing.Size(515, 137)
+		Me.GrStartStop.TabIndex = 0
+		Me.GrStartStop.TabStop = False
+		Me.GrStartStop.Text = "Engine Start Stop"
+		'
+		'PnStartStop
+		'
+		Me.PnStartStop.Controls.Add(Me.Label31)
+		Me.PnStartStop.Controls.Add(Me.Label27)
+		Me.PnStartStop.Controls.Add(Me.TbSSspeed)
+		Me.PnStartStop.Controls.Add(Me.LabelSSspeed)
+		Me.PnStartStop.Controls.Add(Me.Label26)
+		Me.PnStartStop.Controls.Add(Me.Label30)
+		Me.PnStartStop.Controls.Add(Me.LabelSStime)
+		Me.PnStartStop.Controls.Add(Me.TbSSdelay)
+		Me.PnStartStop.Controls.Add(Me.TbSStime)
+		Me.PnStartStop.Location = New System.Drawing.Point(87, 21)
+		Me.PnStartStop.Name = "PnStartStop"
+		Me.PnStartStop.Size = New System.Drawing.Size(422, 95)
+		Me.PnStartStop.TabIndex = 1
+		'
+		'Label31
+		'
+		Me.Label31.AutoSize = True
+		Me.Label31.Location = New System.Drawing.Point(228, 58)
+		Me.Label31.Name = "Label31"
+		Me.Label31.Size = New System.Drawing.Size(18, 13)
+		Me.Label31.TabIndex = 38
+		Me.Label31.Text = "[s]"
+		'
+		'Label27
+		'
+		Me.Label27.AutoSize = True
+		Me.Label27.Location = New System.Drawing.Point(228, 32)
+		Me.Label27.Name = "Label27"
+		Me.Label27.Size = New System.Drawing.Size(18, 13)
+		Me.Label27.TabIndex = 38
+		Me.Label27.Text = "[s]"
+		'
+		'TbSSspeed
+		'
+		Me.TbSSspeed.Location = New System.Drawing.Point(158, 3)
+		Me.TbSSspeed.Name = "TbSSspeed"
+		Me.TbSSspeed.Size = New System.Drawing.Size(64, 20)
+		Me.TbSSspeed.TabIndex = 0
+		'
+		'LabelSSspeed
+		'
+		Me.LabelSSspeed.AutoSize = True
+		Me.LabelSSspeed.Location = New System.Drawing.Point(91, 6)
+		Me.LabelSSspeed.Name = "LabelSSspeed"
+		Me.LabelSSspeed.Size = New System.Drawing.Size(61, 13)
+		Me.LabelSSspeed.TabIndex = 37
+		Me.LabelSSspeed.Text = "Max Speed"
+		'
+		'Label26
+		'
+		Me.Label26.AutoSize = True
+		Me.Label26.Location = New System.Drawing.Point(228, 6)
+		Me.Label26.Name = "Label26"
+		Me.Label26.Size = New System.Drawing.Size(38, 13)
+		Me.Label26.TabIndex = 38
+		Me.Label26.Text = "[km/h]"
+		'
+		'Label30
+		'
+		Me.Label30.AutoSize = True
+		Me.Label30.Location = New System.Drawing.Point(68, 58)
+		Me.Label30.Name = "Label30"
+		Me.Label30.Size = New System.Drawing.Size(84, 13)
+		Me.Label30.TabIndex = 35
+		Me.Label30.Text = "Activation Delay"
+		'
+		'LabelSStime
+		'
+		Me.LabelSStime.AutoSize = True
+		Me.LabelSStime.Location = New System.Drawing.Point(65, 32)
+		Me.LabelSStime.Name = "LabelSStime"
+		Me.LabelSStime.Size = New System.Drawing.Size(87, 13)
+		Me.LabelSStime.TabIndex = 35
+		Me.LabelSStime.Text = "Min ICE-On Time"
+		'
+		'TbSSdelay
+		'
+		Me.TbSSdelay.Location = New System.Drawing.Point(158, 55)
+		Me.TbSSdelay.Name = "TbSSdelay"
+		Me.TbSSdelay.Size = New System.Drawing.Size(64, 20)
+		Me.TbSSdelay.TabIndex = 2
+		'
+		'TbSStime
+		'
+		Me.TbSStime.Location = New System.Drawing.Point(158, 29)
+		Me.TbSStime.Name = "TbSStime"
+		Me.TbSStime.Size = New System.Drawing.Size(64, 20)
+		Me.TbSStime.TabIndex = 1
+		'
+		'ChBStartStop
+		'
+		Me.ChBStartStop.AutoSize = True
+		Me.ChBStartStop.Checked = True
+		Me.ChBStartStop.CheckState = System.Windows.Forms.CheckState.Checked
+		Me.ChBStartStop.Location = New System.Drawing.Point(16, 21)
+		Me.ChBStartStop.Name = "ChBStartStop"
+		Me.ChBStartStop.Size = New System.Drawing.Size(65, 17)
+		Me.ChBStartStop.TabIndex = 0
+		Me.ChBStartStop.Text = "Enabled"
+		Me.ChBStartStop.UseVisualStyleBackColor = True
+		'
+		'StatusStrip1
+		'
+		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 627)
+		Me.StatusStrip1.Name = "StatusStrip1"
+		Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
+		Me.StatusStrip1.SizingGrip = False
+		Me.StatusStrip1.TabIndex = 6
+		Me.StatusStrip1.Text = "StatusStrip1"
+		'
+		'ToolStripStatusLabelGEN
+		'
+		Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
+		Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(121, 17)
+		Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
+		'
+		'ButOK
+		'
+		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButOK.Location = New System.Drawing.Point(779, 601)
+		Me.ButOK.Name = "ButOK"
+		Me.ButOK.Size = New System.Drawing.Size(75, 23)
+		Me.ButOK.TabIndex = 0
+		Me.ButOK.Text = "Save"
+		Me.ButOK.UseVisualStyleBackColor = True
+		'
+		'ButCancel
+		'
+		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.ButCancel.Location = New System.Drawing.Point(860, 601)
+		Me.ButCancel.Name = "ButCancel"
+		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+		Me.ButCancel.TabIndex = 1
+		Me.ButCancel.Text = "Cancel"
+		Me.ButCancel.UseVisualStyleBackColor = True
+		'
+		'ToolStrip1
+		'
+		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
+		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+		Me.ToolStrip1.Name = "ToolStrip1"
+		Me.ToolStrip1.Size = New System.Drawing.Size(944, 25)
+		Me.ToolStrip1.TabIndex = 20
+		Me.ToolStrip1.Text = "ToolStrip1"
+		'
+		'ToolStripBtNew
+		'
+		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
+		Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtNew.Name = "ToolStripBtNew"
+		Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtNew.Text = "New"
+		Me.ToolStripBtNew.ToolTipText = "New"
+		'
+		'ToolStripBtOpen
+		'
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtOpen.Text = "Open"
+		Me.ToolStripBtOpen.ToolTipText = "Open..."
+		'
+		'ToolStripBtSave
+		'
+		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
+		Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSave.Name = "ToolStripBtSave"
+		Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSave.Text = "Save"
+		Me.ToolStripBtSave.ToolTipText = "Save"
+		'
+		'ToolStripBtSaveAs
+		'
+		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+		Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+		Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSaveAs.Text = "Save As"
+		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+		'
+		'ToolStripSeparator1
+		'
+		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripBtSendTo
+		'
+		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
+		Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+		Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtSendTo.Text = "Send to Job List"
+		Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
+		'
+		'ToolStripSeparator2
+		'
+		Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+		Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripButton1
+		'
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton1.Name = "ToolStripButton1"
+		Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripButton1.Text = "Help"
+		'
+		'PictureBox1
+		'
+		Me.PictureBox1.BackColor = System.Drawing.Color.White
+		Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_VECTO
+		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
+		Me.PictureBox1.Name = "PictureBox1"
+		Me.PictureBox1.Size = New System.Drawing.Size(920, 40)
+		Me.PictureBox1.TabIndex = 21
+		Me.PictureBox1.TabStop = False
+		'
+		'CbEngOnly
+		'
+		Me.CbEngOnly.AutoSize = True
+		Me.CbEngOnly.Location = New System.Drawing.Point(17, 84)
+		Me.CbEngOnly.Name = "CbEngOnly"
+		Me.CbEngOnly.Size = New System.Drawing.Size(113, 17)
+		Me.CbEngOnly.TabIndex = 0
+		Me.CbEngOnly.Text = "Engine Only Mode"
+		Me.CbEngOnly.UseVisualStyleBackColor = True
+		'
+		'CmOpenFile
+		'
+		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+		Me.CmOpenFile.Name = "CmOpenFile"
+		Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+		'
+		'OpenWithToolStripMenuItem
+		'
+		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+		'
+		'ShowInFolderToolStripMenuItem
+		'
+		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+		'
+		'PicVehicle
+		'
+		Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
+		Me.PicVehicle.Location = New System.Drawing.Point(542, 122)
+		Me.PicVehicle.Name = "PicVehicle"
+		Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
+		Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+		Me.PicVehicle.TabIndex = 36
+		Me.PicVehicle.TabStop = False
+		'
+		'PicBox
+		'
+		Me.PicBox.BackColor = System.Drawing.Color.LightGray
+		Me.PicBox.Location = New System.Drawing.Point(542, 268)
+		Me.PicBox.Name = "PicBox"
+		Me.PicBox.Size = New System.Drawing.Size(390, 327)
+		Me.PicBox.TabIndex = 36
+		Me.PicBox.TabStop = False
+		'
+		'TbEngTxt
+		'
+		Me.TbEngTxt.Location = New System.Drawing.Point(542, 216)
+		Me.TbEngTxt.Name = "TbEngTxt"
+		Me.TbEngTxt.ReadOnly = True
+		Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
+		Me.TbEngTxt.TabIndex = 6
+		'
+		'TbVehCat
+		'
+		Me.TbVehCat.Location = New System.Drawing.Point(848, 126)
+		Me.TbVehCat.Name = "TbVehCat"
+		Me.TbVehCat.ReadOnly = True
+		Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
+		Me.TbVehCat.TabIndex = 2
+		'
+		'TbAxleConf
+		'
+		Me.TbAxleConf.Location = New System.Drawing.Point(904, 155)
+		Me.TbAxleConf.Name = "TbAxleConf"
+		Me.TbAxleConf.ReadOnly = True
+		Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
+		Me.TbAxleConf.TabIndex = 4
+		'
+		'TbHVCclass
+		'
+		Me.TbHVCclass.Location = New System.Drawing.Point(848, 184)
+		Me.TbHVCclass.Name = "TbHVCclass"
+		Me.TbHVCclass.ReadOnly = True
+		Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
+		Me.TbHVCclass.TabIndex = 5
+		'
+		'TbGbxTxt
+		'
+		Me.TbGbxTxt.Location = New System.Drawing.Point(542, 242)
+		Me.TbGbxTxt.Name = "TbGbxTxt"
+		Me.TbGbxTxt.ReadOnly = True
+		Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
+		Me.TbGbxTxt.TabIndex = 7
+		'
+		'TbMass
+		'
+		Me.TbMass.Location = New System.Drawing.Point(848, 155)
+		Me.TbMass.Name = "TbMass"
+		Me.TbMass.ReadOnly = True
+		Me.TbMass.Size = New System.Drawing.Size(50, 20)
+		Me.TbMass.TabIndex = 3
+		'
+		'F_VECTO
+		'
+		Me.AcceptButton = Me.ButOK
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.ButCancel
+		Me.ClientSize = New System.Drawing.Size(944, 649)
+		Me.Controls.Add(Me.TbHVCclass)
+		Me.Controls.Add(Me.TbMass)
+		Me.Controls.Add(Me.TbAxleConf)
+		Me.Controls.Add(Me.TbVehCat)
+		Me.Controls.Add(Me.TbGbxTxt)
+		Me.Controls.Add(Me.TbEngTxt)
+		Me.Controls.Add(Me.PicBox)
+		Me.Controls.Add(Me.PicVehicle)
+		Me.Controls.Add(Me.CbEngOnly)
+		Me.Controls.Add(Me.PictureBox1)
+		Me.Controls.Add(Me.ToolStrip1)
+		Me.Controls.Add(Me.ButCancel)
+		Me.Controls.Add(Me.TabControl1)
+		Me.Controls.Add(Me.ButOK)
+		Me.Controls.Add(Me.StatusStrip1)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MaximizeBox = False
+		Me.Name = "F_VECTO"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "Job Editor"
+		Me.TabPgGen.ResumeLayout(False)
+		Me.TabPgGen.PerformLayout()
+		Me.GrCycles.ResumeLayout(False)
+		Me.GrCycles.PerformLayout()
+		Me.GrAux.ResumeLayout(False)
+		Me.GrAux.PerformLayout()
+		Me.TabControl1.ResumeLayout(False)
+		Me.TabPgDriver.ResumeLayout(False)
+		Me.GrVACC.ResumeLayout(False)
+		Me.GrVACC.PerformLayout()
+		Me.GrLAC.ResumeLayout(False)
+		Me.GrLAC.PerformLayout()
+		Me.PnLookAhead.ResumeLayout(False)
+		Me.PnLookAhead.PerformLayout()
+		Me.GroupBox1.ResumeLayout(False)
+		Me.GroupBox1.PerformLayout()
+		Me.PnEcoRoll.ResumeLayout(False)
+		Me.PnEcoRoll.PerformLayout()
+		Me.GrStartStop.ResumeLayout(False)
+		Me.GrStartStop.PerformLayout()
+		Me.PnStartStop.ResumeLayout(False)
+		Me.PnStartStop.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.CmOpenFile.ResumeLayout(False)
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-    End Sub
+	End Sub
     Friend WithEvents TabPgGen As System.Windows.Forms.TabPage
     Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
     Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index d7366c0dde6b48fcd9b5e2848525b57fe53f326d..a1d4e44cc5726e37f3fdf622bc9c4408a8f44026 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -26,11 +26,17 @@ Public Class F_VECTO
 
     Private AuxDlog As F_VEH_AuxDlog
 
-    Private EStechs As New List(Of String)
+	Private EStechs As New List(Of String)
+
+	Public n_idle As Single
+	Public FLDfile As String
 
     'Initialise form
     Private Sub F02_GEN_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        Dim x As Int16
+		Dim x As Int16
+
+		n_idle = -1
+		FLDfile = ""
 
         AuxDlog = New F_VEH_AuxDlog
 
@@ -538,6 +544,9 @@ Public Class F_VECTO
 
         If ChangeCheckCancel() Then Exit Sub
 
+		n_idle = -1
+		FLDfile = ""
+
         'Files
         Me.TbVEH.Text = ""
         Me.TbENG.Text = ""
@@ -959,158 +968,133 @@ lbDlog:
         Dim ENG0 As cENG
         Dim GBX0 As cGBX
         Dim FLD0 As cFLD
-        Dim Shiftpoly As cGBX.cShiftPolygon
-        Dim MAP0 As cMAP
-        Dim OkCount As Integer
-        Dim i As Integer
-        Dim pmax As Single
-
-        Dim f As cFile_V3 = Nothing
-        Dim lM As List(Of Single)
-        Dim lup As List(Of Single)
-        Dim ldown As List(Of Single)
-        Dim line As String() = Nothing
-
-        Dim s0 As cSegmentTableEntry = Nothing
-        Dim HDVclass As String
-        Dim m0 As tMission
-
-        Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart
-        Dim s As System.Windows.Forms.DataVisualization.Charting.Series
-        Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea
-        Dim img As Image
-
-        Me.TbHVCclass.Text = ""
-        Me.TbVehCat.Text = ""
-        Me.TbMass.Text = ""
-        Me.TbAxleConf.Text = ""
-        Me.TbEngTxt.Text = ""
-        Me.TbGbxTxt.Text = ""
-        Me.PicVehicle.Image = Nothing
-        Me.PicBox.Image = Nothing
-
-
-        VEH0.FilePath = fFileRepl(Me.TbVEH.Text, fPATH(VECTOfile))
-        If VEH0.ReadFile(False) Then
-
-            If Declaration.SegmentTable.SetRef(s0, VEH0.VehCat, VEH0.AxleConf, VEH0.MassMax) Then
-                HDVclass = s0.HDVclass
-
-                If Cfg.DeclMode Then
-                    Me.LvCycles.Items.Clear()
-                    For Each m0 In s0.Missions
-                        Me.LvCycles.Items.Add(Declaration.Missions(m0).NameStr)
-                    Next
-                End If
+		Dim Shiftpoly As cGBX.cShiftPolygon
+		Dim MAP0 As cMAP
+		Dim OkCount As Integer
+		Dim i As Integer
+		Dim pmax As Single
 
-            Else
-                HDVclass = "-"
-            End If
+		Dim f As cFile_V3 = Nothing
+		Dim lM As List(Of Single)
+		Dim lup As List(Of Single)
+		Dim ldown As List(Of Single)
+		Dim line As String() = Nothing
 
-            Me.PicVehicle.Image = Image.FromFile(Declaration.ConvPicPath(HDVclass, False))
+		Dim s0 As cSegmentTableEntry = Nothing
+		Dim HDVclass As String
+		Dim m0 As tMission
 
-            Me.TbHVCclass.Text = "HDV Class " & HDVclass
-            Me.TbVehCat.Text = ConvVehCat(VEH0.VehCat, True)
-            Me.TbMass.Text = VEH0.MassMax & " t"
-            Me.TbAxleConf.Text = ConvAxleConf(VEH0.AxleConf)
+		Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart
+		Dim s As System.Windows.Forms.DataVisualization.Charting.Series
+		Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea
+		Dim img As Image
 
-        End If
+		Dim EngOK As Boolean = False
 
+		Me.TbHVCclass.Text = ""
+		Me.TbVehCat.Text = ""
+		Me.TbMass.Text = ""
+		Me.TbAxleConf.Text = ""
+		Me.TbEngTxt.Text = ""
+		Me.TbGbxTxt.Text = ""
+		Me.PicVehicle.Image = Nothing
+		Me.PicBox.Image = Nothing
 
-        OkCount = 0
 
-        ENG0 = New cENG
-        ENG0.FilePath = fFileRepl(Me.TbENG.Text, fPATH(VECTOfile))
+		VEH0.FilePath = fFileRepl(Me.TbVEH.Text, fPATH(VECTOfile))
+		If VEH0.ReadFile(False) Then
 
-        'Create plot
-        MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart
-        MyChart.Width = Me.PicBox.Width
-        MyChart.Height = Me.PicBox.Height
+			If Declaration.SegmentTable.SetRef(s0, VEH0.VehCat, VEH0.AxleConf, VEH0.MassMax) Then
+				HDVclass = s0.HDVclass
 
-        a = New System.Windows.Forms.DataVisualization.Charting.ChartArea
+				If Cfg.DeclMode Then
+					Me.LvCycles.Items.Clear()
+					For Each m0 In s0.Missions
+						Me.LvCycles.Items.Add(Declaration.Missions(m0).NameStr)
+					Next
+				End If
 
-        If ENG0.ReadFile(False) Then
+			Else
+				HDVclass = "-"
+			End If
 
-            FLD0 = New cFLD
+			Me.PicVehicle.Image = Image.FromFile(Declaration.ConvPicPath(HDVclass, False))
 
-            For i = 0 To ENG0.fFLD.Count - 1
+			Me.TbHVCclass.Text = "HDV Class " & HDVclass
+			Me.TbVehCat.Text = ConvVehCat(VEH0.VehCat, True)
+			Me.TbMass.Text = VEH0.MassMax & " t"
+			Me.TbAxleConf.Text = ConvAxleConf(VEH0.AxleConf)
 
-                FLD0.FilePath = ENG0.fFLD(i).FullPath
-                If FLD0.ReadFile(False) Then
+		End If
 
-                    s = New System.Windows.Forms.DataVisualization.Charting.Series
-                    s.Points.DataBindXY(FLD0.LnU, FLD0.LTq)
-                    s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                    s.BorderWidth = 2
-                    s.Color = Color.DarkBlue
-                    s.Name = "Full load (" & fFILE(FLD0.FilePath, True) & ")"
-                    MyChart.Series.Add(s)
 
-                    s = New System.Windows.Forms.DataVisualization.Charting.Series
-                    s.Points.DataBindXY(FLD0.LnU, FLD0.LTqDrag)
-                    s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                    s.BorderWidth = 2
-                    s.Color = Color.Blue
-                    s.Name = "Motoring (" & fFILE(FLD0.FilePath, True) & ")"
-                    MyChart.Series.Add(s)
+		OkCount = 0
 
-                    If Cfg.DeclMode Then
+		ENG0 = New cENG
+		ENG0.FilePath = fFileRepl(Me.TbENG.Text, fPATH(VECTOfile))
 
-                        If FLD0.Init(ENG0.Nidle) Then
-                            Shiftpoly = New cGBX.cShiftPolygon("", 0)
-                            Shiftpoly.SetGenericShiftPoly(FLD0, ENG0.Nidle)
+		'Create plot
+		MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart
+		MyChart.Width = Me.PicBox.Width
+		MyChart.Height = Me.PicBox.Height
 
-                            s = New System.Windows.Forms.DataVisualization.Charting.Series
-                            s.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp)
-                            s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                            s.BorderWidth = 2
-                            s.Color = Color.DarkRed
-                            s.Name = "Upshift curve"
-                            MyChart.Series.Add(s)
+		a = New System.Windows.Forms.DataVisualization.Charting.ChartArea
 
-                            s = New System.Windows.Forms.DataVisualization.Charting.Series
-                            s.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown)
-                            s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                            s.BorderWidth = 2
-                            s.Color = Color.DarkRed
-                            s.Name = "Downshift curve"
-                            MyChart.Series.Add(s)
-                        End If
+		FLD0 = New cFLD
 
-                    End If
+		If ENG0.ReadFile(False) Then
 
-                    OkCount += 1
+			n_idle = ENG0.Nidle
+			FLDfile = ENG0.PathFLD
 
-                    pmax = FLD0.Pfull(FLD0.fnUrated)
+			EngOK = True
+			FLD0.FilePath = ENG0.PathFLD
 
+			If FLD0.ReadFile(False, False) Then
 
-                End If
+				s = New System.Windows.Forms.DataVisualization.Charting.Series
+				s.Points.DataBindXY(FLD0.LnU, FLD0.LTq)
+				s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+				s.BorderWidth = 2
+				s.Color = Color.DarkBlue
+				s.Name = "Full load"
+				MyChart.Series.Add(s)
 
+				s = New System.Windows.Forms.DataVisualization.Charting.Series
+				s.Points.DataBindXY(FLD0.LnU, FLD0.LTqDrag)
+				s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+				s.BorderWidth = 2
+				s.Color = Color.Blue
+				s.Name = "Motoring"
+				MyChart.Series.Add(s)
 
+				OkCount += 1
 
-            Next
+				pmax = FLD0.Pfull(FLD0.fnUrated)
 
-            Me.TbEngTxt.Text = (ENG0.Displ / 1000).ToString("0.0") & " l " & pmax.ToString("#") & " kW  " & ENG0.ModelName
+			End If
 
+			Me.TbEngTxt.Text = (ENG0.Displ / 1000).ToString("0.0") & " l " & pmax.ToString("#") & " kW  " & ENG0.ModelName
 
-            MAP0 = New cMAP
-            MAP0.FilePath = ENG0.PathMAP
 
-            If MAP0.ReadFile(False) Then
+			MAP0 = New cMAP
+			MAP0.FilePath = ENG0.PathMAP
 
-                s = New System.Windows.Forms.DataVisualization.Charting.Series
-                s.Points.DataBindXY(MAP0.nU, MAP0.Tq)
-                s.ChartType = DataVisualization.Charting.SeriesChartType.Point
-                s.MarkerSize = 3
-                s.Color = Color.Red
-                s.Name = "Map"
-                MyChart.Series.Add(s)
+			If MAP0.ReadFile(False) Then
 
-                OkCount += 1
+				s = New System.Windows.Forms.DataVisualization.Charting.Series
+				s.Points.DataBindXY(MAP0.nU, MAP0.Tq)
+				s.ChartType = DataVisualization.Charting.SeriesChartType.Point
+				s.MarkerSize = 3
+				s.Color = Color.Red
+				s.Name = "Map"
+				MyChart.Series.Add(s)
 
-            End If
+				OkCount += 1
 
-        End If
+			End If
+
+		End If
 
         GBX0 = New cGBX
         GBX0.FilePath = fFileRepl(Me.TbGBX.Text, fPATH(VECTOfile))
@@ -1119,92 +1103,136 @@ lbDlog:
 
             Me.TbGbxTxt.Text = GBX0.GearCount & "-Speed " & GearboxConv(GBX0.gs_Type) & "  " & GBX0.ModelName
 
-            If Not Cfg.DeclMode Then
-                f = New cFile_V3
-                For i = 0 To GBX0.GearCount - 1
+			If Cfg.DeclMode Then
 
-                    lM = New List(Of Single)
-                    lup = New List(Of Single)
-                    ldown = New List(Of Single)
+				If EngOK Then
 
-                    If f.OpenRead(GBX0.gsFile(i)) Then
+					For i = 1 To GBX0.GearCount
 
-                        f.ReadLine()
+						FLD0.FilePath = GBX0.FldFile(i)
+						If FLD0.FilePath.Trim = "" Then FLD0.FilePath = ENG0.PathFLD
 
-                        Try
+						If FLD0.ReadFile(True, False) Then
 
-                            Do While Not f.EndOfFile
-                                line = f.ReadLine
-                                lM.Add(CSng(line(0)))
-                                lup.Add(CSng(line(1)))
-                                ldown.Add(CSng(line(2)))
-                            Loop
+							If FLD0.Init(ENG0.Nidle) Then
+								Shiftpoly = New cGBX.cShiftPolygon("", 0)
+								Shiftpoly.SetGenericShiftPoly(FLD0, ENG0.Nidle)
 
-                            s = New System.Windows.Forms.DataVisualization.Charting.Series
-                            s.Points.DataBindXY(lup, lM)
-                            s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                            s.BorderWidth = 2
-                            s.Color = Color.DarkRed
-                            s.Name = "Upshift curve"
-                            MyChart.Series.Add(s)
+								s = New System.Windows.Forms.DataVisualization.Charting.Series
+								s.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp)
+								s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+								s.BorderWidth = 2
+								s.Color = Color.DarkRed
+								s.Name = "Upshift curve (" & i & ")"
+								MyChart.Series.Add(s)
 
-                            s = New System.Windows.Forms.DataVisualization.Charting.Series
-                            s.Points.DataBindXY(ldown, lM)
-                            s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
-                            s.BorderWidth = 2
-                            s.Color = Color.DarkRed
-                            s.Name = "Downshift curve"
-                            MyChart.Series.Add(s)
+								s = New System.Windows.Forms.DataVisualization.Charting.Series
+								s.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown)
+								s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+								s.BorderWidth = 2
+								s.Color = Color.DarkRed
+								s.Name = "Downshift curve (" & i & ")"
+								MyChart.Series.Add(s)
+							End If
 
-                            OkCount += 1
 
-                            f.Close()
+							OkCount += 1
 
-                        Catch ex As Exception
-                            f.Close()
-                        End Try
+							pmax = FLD0.Pfull(FLD0.fnUrated)
 
-                    End If
+						End If
 
-                Next
+					Next
 
-            End If
+				End If
 
-        End If
+			Else
 
-        If OkCount > 0 Then
+				f = New cFile_V3
+				For i = 1 To GBX0.GearCount
 
-            a.Name = "main"
+					lM = New List(Of Single)
+					lup = New List(Of Single)
+					ldown = New List(Of Single)
 
-            a.AxisX.Title = "engine speed [1/min]"
-            a.AxisX.TitleFont = New Font("Helvetica", 10)
-            a.AxisX.LabelStyle.Font = New Font("Helvetica", 8)
-            a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
-            a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+					If f.OpenRead(GBX0.gsFile(i)) Then
 
-            a.AxisY.Title = "engine torque [Nm]"
-            a.AxisY.TitleFont = New Font("Helvetica", 10)
-            a.AxisY.LabelStyle.Font = New Font("Helvetica", 8)
-            a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
-            a.AxisY.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+						f.ReadLine()
 
-            a.AxisX.Minimum = 300
-            a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid
-            a.BorderWidth = 1
+						Try
 
-            a.BackColor = Color.GhostWhite
+							Do While Not f.EndOfFile
+								line = f.ReadLine
+								lM.Add(CSng(line(0)))
+								lup.Add(CSng(line(1)))
+								ldown.Add(CSng(line(2)))
+							Loop
 
-            MyChart.ChartAreas.Add(a)
+							s = New System.Windows.Forms.DataVisualization.Charting.Series
+							s.Points.DataBindXY(lup, lM)
+							s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+							s.BorderWidth = 2
+							s.Color = Color.DarkRed
+							s.Name = "Upshift curve"
+							MyChart.Series.Add(s)
 
-            MyChart.Update()
+							s = New System.Windows.Forms.DataVisualization.Charting.Series
+							s.Points.DataBindXY(ldown, lM)
+							s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+							s.BorderWidth = 2
+							s.Color = Color.DarkRed
+							s.Name = "Downshift curve"
+							MyChart.Series.Add(s)
 
-            img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb)
-            MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height))
+							OkCount += 1
 
-            Me.PicBox.Image = img
+							f.Close()
 
+						Catch ex As Exception
+							f.Close()
+						End Try
 
-        End If
+					End If
+
+				Next
+
+			End If
+
+		End If
+
+		If OkCount > 0 Then
+
+			a.Name = "main"
+
+			a.AxisX.Title = "engine speed [1/min]"
+			a.AxisX.TitleFont = New Font("Helvetica", 10)
+			a.AxisX.LabelStyle.Font = New Font("Helvetica", 8)
+			a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
+			a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+
+			a.AxisY.Title = "engine torque [Nm]"
+			a.AxisY.TitleFont = New Font("Helvetica", 10)
+			a.AxisY.LabelStyle.Font = New Font("Helvetica", 8)
+			a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None
+			a.AxisY.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot
+
+			a.AxisX.Minimum = 300
+			a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid
+			a.BorderWidth = 1
+
+			a.BackColor = Color.GhostWhite
+
+			MyChart.ChartAreas.Add(a)
+
+			MyChart.Update()
+
+			img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb)
+			MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height))
+
+			Me.PicBox.Image = img
+
+
+		End If
 
     End Sub
 
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index acd224f9e5cd33071ef2f3d4d1e659f9aa5b955f..b9d926194674567b71767d73e56855b2bc58d3e1 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -39,9 +39,7 @@ Partial Class F_VEH
 		Me.Label2 = New System.Windows.Forms.Label()
 		Me.TbLoad = New System.Windows.Forms.TextBox()
 		Me.Label3 = New System.Windows.Forms.Label()
-		Me.TBcdTrTr = New System.Windows.Forms.TextBox()
-		Me.Label4 = New System.Windows.Forms.Label()
-		Me.TBAquersTrTr = New System.Windows.Forms.TextBox()
+		Me.TBcdA = New System.Windows.Forms.TextBox()
 		Me.Label13 = New System.Windows.Forms.Label()
 		Me.TBrdyn = New System.Windows.Forms.TextBox()
 		Me.ButOK = New System.Windows.Forms.Button()
@@ -49,8 +47,6 @@ Partial Class F_VEH
 		Me.Label14 = New System.Windows.Forms.Label()
 		Me.Label31 = New System.Windows.Forms.Label()
 		Me.Label35 = New System.Windows.Forms.Label()
-		Me.Label37 = New System.Windows.Forms.Label()
-		Me.Label38 = New System.Windows.Forms.Label()
 		Me.CbCdMode = New System.Windows.Forms.ComboBox()
 		Me.TbCdFile = New System.Windows.Forms.TextBox()
 		Me.BtCdFileBrowse = New System.Windows.Forms.Button()
@@ -111,8 +107,8 @@ Partial Class F_VEH
 		Me.LbCdATr = New System.Windows.Forms.Label()
 		Me.PnCdARig = New System.Windows.Forms.Panel()
 		Me.LbCdARig = New System.Windows.Forms.Label()
-		Me.TBcwRig = New System.Windows.Forms.TextBox()
-		Me.TBAquersRig = New System.Windows.Forms.TextBox()
+		Me.TBcdA2 = New System.Windows.Forms.TextBox()
+		Me.Label38 = New System.Windows.Forms.Label()
 		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
 		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
 		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -168,43 +164,25 @@ Partial Class F_VEH
 		Me.TbLoad.Location = New System.Drawing.Point(166, 28)
 		Me.TbLoad.Name = "TbLoad"
 		Me.TbLoad.Size = New System.Drawing.Size(57, 20)
-		Me.TbLoad.TabIndex = 2
+		Me.TbLoad.TabIndex = 1
 		'
 		'Label3
 		'
 		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(37, 55)
+		Me.Label3.Location = New System.Drawing.Point(36, 52)
 		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(58, 13)
+		Me.Label3.Size = New System.Drawing.Size(37, 13)
 		Me.Label3.TabIndex = 8
-		Me.Label3.Text = "Drag Coef."
-		'
-		'TBcdTrTr
-		'
-		Me.TBcdTrTr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TBcdTrTr.Location = New System.Drawing.Point(2, 24)
-		Me.TBcdTrTr.Name = "TBcdTrTr"
-		Me.TBcdTrTr.Size = New System.Drawing.Size(57, 20)
-		Me.TBcdTrTr.TabIndex = 0
-		'
-		'Label4
+		Me.Label3.Text = "cd x A"
 		'
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(12, 81)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(83, 13)
-		Me.Label4.TabIndex = 10
-		Me.Label4.Text = "Cross Sec. Area"
+		'TBcdA
 		'
-		'TBAquersTrTr
-		'
-		Me.TBAquersTrTr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+		Me.TBcdA.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
 			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TBAquersTrTr.Location = New System.Drawing.Point(2, 50)
-		Me.TBAquersTrTr.Name = "TBAquersTrTr"
-		Me.TBAquersTrTr.Size = New System.Drawing.Size(57, 20)
-		Me.TBAquersTrTr.TabIndex = 1
+		Me.TBcdA.Location = New System.Drawing.Point(2, 24)
+		Me.TBcdA.Name = "TBcdA"
+		Me.TBcdA.Size = New System.Drawing.Size(57, 20)
+		Me.TBcdA.TabIndex = 0
 		'
 		'Label13
 		'
@@ -220,7 +198,7 @@ Partial Class F_VEH
 		Me.TBrdyn.Location = New System.Drawing.Point(109, 4)
 		Me.TBrdyn.Name = "TBrdyn"
 		Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
-		Me.TBrdyn.TabIndex = 5
+		Me.TBrdyn.TabIndex = 0
 		'
 		'ButOK
 		'
@@ -228,7 +206,7 @@ Partial Class F_VEH
 		Me.ButOK.Location = New System.Drawing.Point(394, 693)
 		Me.ButOK.Name = "ButOK"
 		Me.ButOK.Size = New System.Drawing.Size(75, 23)
-		Me.ButOK.TabIndex = 9
+		Me.ButOK.TabIndex = 5
 		Me.ButOK.Text = "Save"
 		Me.ButOK.UseVisualStyleBackColor = True
 		'
@@ -239,7 +217,7 @@ Partial Class F_VEH
 		Me.ButCancel.Location = New System.Drawing.Point(475, 693)
 		Me.ButCancel.Name = "ButCancel"
 		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-		Me.ButCancel.TabIndex = 10
+		Me.ButCancel.TabIndex = 6
 		Me.ButCancel.Text = "Cancel"
 		Me.ButCancel.UseVisualStyleBackColor = True
 		'
@@ -270,24 +248,6 @@ Partial Class F_VEH
 		Me.Label35.TabIndex = 24
 		Me.Label35.Text = "[mm]"
 		'
-		'Label37
-		'
-		Me.Label37.AutoSize = True
-		Me.Label37.Location = New System.Drawing.Point(230, 53)
-		Me.Label37.Name = "Label37"
-		Me.Label37.Size = New System.Drawing.Size(16, 13)
-		Me.Label37.TabIndex = 24
-		Me.Label37.Text = "[-]"
-		'
-		'Label38
-		'
-		Me.Label38.AutoSize = True
-		Me.Label38.Location = New System.Drawing.Point(230, 79)
-		Me.Label38.Name = "Label38"
-		Me.Label38.Size = New System.Drawing.Size(24, 13)
-		Me.Label38.TabIndex = 24
-		Me.Label38.Text = "[m²]"
-		'
 		'CbCdMode
 		'
 		Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
@@ -326,7 +286,7 @@ Partial Class F_VEH
 		Me.GroupBox6.Location = New System.Drawing.Point(6, 432)
 		Me.GroupBox6.Name = "GroupBox6"
 		Me.GroupBox6.Size = New System.Drawing.Size(538, 74)
-		Me.GroupBox6.TabIndex = 5
+		Me.GroupBox6.TabIndex = 4
 		Me.GroupBox6.TabStop = False
 		Me.GroupBox6.Text = "Cross Wind Correction"
 		'
@@ -337,7 +297,7 @@ Partial Class F_VEH
 		Me.BtCdFileOpen.Location = New System.Drawing.Point(509, 44)
 		Me.BtCdFileOpen.Name = "BtCdFileOpen"
 		Me.BtCdFileOpen.Size = New System.Drawing.Size(23, 23)
-		Me.BtCdFileOpen.TabIndex = 41
+		Me.BtCdFileOpen.TabIndex = 3
 		Me.BtCdFileOpen.TabStop = False
 		Me.BtCdFileOpen.UseVisualStyleBackColor = True
 		'
@@ -439,7 +399,7 @@ Partial Class F_VEH
 		Me.GroupBox7.Location = New System.Drawing.Point(6, 345)
 		Me.GroupBox7.Name = "GroupBox7"
 		Me.GroupBox7.Size = New System.Drawing.Size(538, 81)
-		Me.GroupBox7.TabIndex = 7
+		Me.GroupBox7.TabIndex = 3
 		Me.GroupBox7.TabStop = False
 		Me.GroupBox7.Text = "Retarder Losses"
 		'
@@ -451,7 +411,7 @@ Partial Class F_VEH
 		Me.PnRt.Location = New System.Drawing.Point(162, 12)
 		Me.PnRt.Name = "PnRt"
 		Me.PnRt.Size = New System.Drawing.Size(348, 34)
-		Me.PnRt.TabIndex = 11
+		Me.PnRt.TabIndex = 1
 		'
 		'Label45
 		'
@@ -486,7 +446,7 @@ Partial Class F_VEH
 		Me.BtRtBrowse.Location = New System.Drawing.Point(500, 52)
 		Me.BtRtBrowse.Name = "BtRtBrowse"
 		Me.BtRtBrowse.Size = New System.Drawing.Size(32, 23)
-		Me.BtRtBrowse.TabIndex = 2
+		Me.BtRtBrowse.TabIndex = 3
 		Me.BtRtBrowse.Text = "..."
 		Me.BtRtBrowse.UseVisualStyleBackColor = True
 		'
@@ -497,7 +457,7 @@ Partial Class F_VEH
 		Me.TbRtPath.Location = New System.Drawing.Point(5, 54)
 		Me.TbRtPath.Name = "TbRtPath"
 		Me.TbRtPath.Size = New System.Drawing.Size(489, 20)
-		Me.TbRtPath.TabIndex = 1
+		Me.TbRtPath.TabIndex = 2
 		'
 		'CbRtType
 		'
@@ -541,7 +501,7 @@ Partial Class F_VEH
 		Me.TbMassExtra.Location = New System.Drawing.Point(166, 2)
 		Me.TbMassExtra.Name = "TbMassExtra"
 		Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
-		Me.TbMassExtra.TabIndex = 1
+		Me.TbMassExtra.TabIndex = 0
 		'
 		'GroupBox8
 		'
@@ -555,7 +515,7 @@ Partial Class F_VEH
 		Me.GroupBox8.Location = New System.Drawing.Point(6, 133)
 		Me.GroupBox8.Name = "GroupBox8"
 		Me.GroupBox8.Size = New System.Drawing.Size(538, 206)
-		Me.GroupBox8.TabIndex = 4
+		Me.GroupBox8.TabIndex = 2
 		Me.GroupBox8.TabStop = False
 		Me.GroupBox8.Text = "Axles / Wheels"
 		'
@@ -567,7 +527,7 @@ Partial Class F_VEH
 		Me.PnWheelDiam.Location = New System.Drawing.Point(321, 163)
 		Me.PnWheelDiam.Name = "PnWheelDiam"
 		Me.PnWheelDiam.Size = New System.Drawing.Size(204, 33)
-		Me.PnWheelDiam.TabIndex = 48
+		Me.PnWheelDiam.TabIndex = 5
 		'
 		'CbRim
 		'
@@ -576,7 +536,7 @@ Partial Class F_VEH
 		Me.CbRim.Location = New System.Drawing.Point(131, 167)
 		Me.CbRim.Name = "CbRim"
 		Me.CbRim.Size = New System.Drawing.Size(184, 21)
-		Me.CbRim.TabIndex = 47
+		Me.CbRim.TabIndex = 4
 		'
 		'Label7
 		'
@@ -593,7 +553,7 @@ Partial Class F_VEH
 		Me.Label6.Location = New System.Drawing.Point(405, 132)
 		Me.Label6.Name = "Label6"
 		Me.Label6.Size = New System.Drawing.Size(121, 13)
-		Me.Label6.TabIndex = 45
+		Me.Label6.TabIndex = 3
 		Me.Label6.Text = "Double-Click to edit axle"
 		'
 		'ButAxlRem
@@ -673,7 +633,7 @@ Partial Class F_VEH
 		Me.CbAxleConfig.Location = New System.Drawing.Point(136, 80)
 		Me.CbAxleConfig.Name = "CbAxleConfig"
 		Me.CbAxleConfig.Size = New System.Drawing.Size(89, 21)
-		Me.CbAxleConfig.TabIndex = 3
+		Me.CbAxleConfig.TabIndex = 1
 		'
 		'CbCat
 		'
@@ -708,7 +668,7 @@ Partial Class F_VEH
 		Me.TbMassMass.Location = New System.Drawing.Point(153, 114)
 		Me.TbMassMass.Name = "TbMassMass"
 		Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
-		Me.TbMassMass.TabIndex = 4
+		Me.TbMassMass.TabIndex = 2
 		'
 		'StatusStrip1
 		'
@@ -732,7 +692,7 @@ Partial Class F_VEH
 		Me.TbHDVclass.Name = "TbHDVclass"
 		Me.TbHDVclass.ReadOnly = True
 		Me.TbHDVclass.Size = New System.Drawing.Size(25, 20)
-		Me.TbHDVclass.TabIndex = 1
+		Me.TbHDVclass.TabIndex = 3
 		Me.TbHDVclass.TabStop = False
 		'
 		'Label11
@@ -750,7 +710,7 @@ Partial Class F_VEH
 		Me.TbLoadingMax.Name = "TbLoadingMax"
 		Me.TbLoadingMax.ReadOnly = True
 		Me.TbLoadingMax.Size = New System.Drawing.Size(57, 20)
-		Me.TbLoadingMax.TabIndex = 3
+		Me.TbLoadingMax.TabIndex = 2
 		Me.TbLoadingMax.TabStop = False
 		'
 		'Label22
@@ -771,7 +731,7 @@ Partial Class F_VEH
 		Me.GroupBox1.Location = New System.Drawing.Point(6, 3)
 		Me.GroupBox1.Name = "GroupBox1"
 		Me.GroupBox1.Size = New System.Drawing.Size(266, 124)
-		Me.GroupBox1.TabIndex = 2
+		Me.GroupBox1.TabIndex = 0
 		Me.GroupBox1.TabStop = False
 		Me.GroupBox1.Text = "Weight / Loading"
 		'
@@ -789,32 +749,29 @@ Partial Class F_VEH
 		Me.PnLoad.Location = New System.Drawing.Point(6, 43)
 		Me.PnLoad.Name = "PnLoad"
 		Me.PnLoad.Size = New System.Drawing.Size(256, 75)
-		Me.PnLoad.TabIndex = 25
+		Me.PnLoad.TabIndex = 1
 		'
 		'GrAirRes
 		'
 		Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
 		Me.GrAirRes.Controls.Add(Me.PnCdARig)
 		Me.GrAirRes.Controls.Add(Me.Label3)
-		Me.GrAirRes.Controls.Add(Me.Label4)
-		Me.GrAirRes.Controls.Add(Me.Label37)
 		Me.GrAirRes.Controls.Add(Me.Label38)
 		Me.GrAirRes.Location = New System.Drawing.Point(278, 3)
 		Me.GrAirRes.Name = "GrAirRes"
 		Me.GrAirRes.Size = New System.Drawing.Size(266, 124)
-		Me.GrAirRes.TabIndex = 3
+		Me.GrAirRes.TabIndex = 1
 		Me.GrAirRes.TabStop = False
 		Me.GrAirRes.Text = "Air Resistance"
 		'
 		'PnCdATrTr
 		'
 		Me.PnCdATrTr.Controls.Add(Me.LbCdATr)
-		Me.PnCdATrTr.Controls.Add(Me.TBcdTrTr)
-		Me.PnCdATrTr.Controls.Add(Me.TBAquersTrTr)
-		Me.PnCdATrTr.Location = New System.Drawing.Point(97, 26)
+		Me.PnCdATrTr.Controls.Add(Me.TBcdA)
+		Me.PnCdATrTr.Location = New System.Drawing.Point(79, 25)
 		Me.PnCdATrTr.Name = "PnCdATrTr"
 		Me.PnCdATrTr.Size = New System.Drawing.Size(64, 78)
-		Me.PnCdATrTr.TabIndex = 27
+		Me.PnCdATrTr.TabIndex = 0
 		'
 		'LbCdATr
 		'
@@ -828,12 +785,11 @@ Partial Class F_VEH
 		'PnCdARig
 		'
 		Me.PnCdARig.Controls.Add(Me.LbCdARig)
-		Me.PnCdARig.Controls.Add(Me.TBcwRig)
-		Me.PnCdARig.Controls.Add(Me.TBAquersRig)
-		Me.PnCdARig.Location = New System.Drawing.Point(164, 26)
+		Me.PnCdARig.Controls.Add(Me.TBcdA2)
+		Me.PnCdARig.Location = New System.Drawing.Point(146, 25)
 		Me.PnCdARig.Name = "PnCdARig"
 		Me.PnCdARig.Size = New System.Drawing.Size(64, 78)
-		Me.PnCdARig.TabIndex = 26
+		Me.PnCdARig.TabIndex = 1
 		'
 		'LbCdARig
 		'
@@ -844,19 +800,21 @@ Partial Class F_VEH
 		Me.LbCdARig.TabIndex = 25
 		Me.LbCdARig.Text = "Rigid"
 		'
-		'TBcwRig
+		'TBcdA2
 		'
-		Me.TBcwRig.Location = New System.Drawing.Point(3, 24)
-		Me.TBcwRig.Name = "TBcwRig"
-		Me.TBcwRig.Size = New System.Drawing.Size(57, 20)
-		Me.TBcwRig.TabIndex = 0
+		Me.TBcdA2.Location = New System.Drawing.Point(3, 24)
+		Me.TBcdA2.Name = "TBcdA2"
+		Me.TBcdA2.Size = New System.Drawing.Size(57, 20)
+		Me.TBcdA2.TabIndex = 0
 		'
-		'TBAquersRig
+		'Label38
 		'
-		Me.TBAquersRig.Location = New System.Drawing.Point(3, 50)
-		Me.TBAquersRig.Name = "TBAquersRig"
-		Me.TBAquersRig.Size = New System.Drawing.Size(57, 20)
-		Me.TBAquersRig.TabIndex = 1
+		Me.Label38.AutoSize = True
+		Me.Label38.Location = New System.Drawing.Point(212, 52)
+		Me.Label38.Name = "Label38"
+		Me.Label38.Size = New System.Drawing.Size(24, 13)
+		Me.Label38.TabIndex = 24
+		Me.Label38.Text = "[m²]"
 		'
 		'PictureBox1
 		'
@@ -896,7 +854,7 @@ Partial Class F_VEH
 		Me.PnAll.Location = New System.Drawing.Point(6, 172)
 		Me.PnAll.Name = "PnAll"
 		Me.PnAll.Size = New System.Drawing.Size(552, 514)
-		Me.PnAll.TabIndex = 38
+		Me.PnAll.TabIndex = 4
 		'
 		'PicVehicle
 		'
@@ -976,82 +934,77 @@ Partial Class F_VEH
 		Me.PerformLayout()
 
 	End Sub
-    Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents TbMass As System.Windows.Forms.TextBox
-    Friend WithEvents Label2 As System.Windows.Forms.Label
-    Friend WithEvents TbLoad As System.Windows.Forms.TextBox
-    Friend WithEvents Label3 As System.Windows.Forms.Label
-    Friend WithEvents TBcdTrTr As System.Windows.Forms.TextBox
-    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents TBAquersTrTr As System.Windows.Forms.TextBox
-    Friend WithEvents Label13 As System.Windows.Forms.Label
-    Friend WithEvents TBrdyn As System.Windows.Forms.TextBox
-    Friend WithEvents ButOK As System.Windows.Forms.Button
-    Friend WithEvents ButCancel As System.Windows.Forms.Button
-    Friend WithEvents Label14 As System.Windows.Forms.Label
-    Friend WithEvents Label31 As System.Windows.Forms.Label
-    Friend WithEvents Label35 As System.Windows.Forms.Label
-    Friend WithEvents Label37 As System.Windows.Forms.Label
-    Friend WithEvents Label38 As System.Windows.Forms.Label
-    Friend WithEvents CbCdMode As System.Windows.Forms.ComboBox
-    Friend WithEvents TbCdFile As System.Windows.Forms.TextBox
-    Friend WithEvents BtCdFileBrowse As System.Windows.Forms.Button
-    Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox
-    Friend WithEvents LbCdMode As System.Windows.Forms.Label
-    Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
-    Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
-    Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
-    Friend WithEvents GroupBox7 As System.Windows.Forms.GroupBox
-    Friend WithEvents LbRtRatio As System.Windows.Forms.Label
-    Friend WithEvents TbRtRatio As System.Windows.Forms.TextBox
-    Friend WithEvents BtRtBrowse As System.Windows.Forms.Button
-    Friend WithEvents TbRtPath As System.Windows.Forms.TextBox
-    Friend WithEvents CbRtType As System.Windows.Forms.ComboBox
-    Friend WithEvents Label12 As System.Windows.Forms.Label
-    Friend WithEvents Label45 As System.Windows.Forms.Label
-    Friend WithEvents PnRt As System.Windows.Forms.Panel
-    Friend WithEvents Label46 As System.Windows.Forms.Label
-    Friend WithEvents Label50 As System.Windows.Forms.Label
-    Friend WithEvents TbMassExtra As System.Windows.Forms.TextBox
-    Friend WithEvents GroupBox8 As System.Windows.Forms.GroupBox
-    Friend WithEvents ButAxlRem As System.Windows.Forms.Button
-    Friend WithEvents LvRRC As System.Windows.Forms.ListView
-    Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents ButAxlAdd As System.Windows.Forms.Button
-    Friend WithEvents CbCat As System.Windows.Forms.ComboBox
-    Friend WithEvents Label5 As System.Windows.Forms.Label
-    Friend WithEvents Label9 As System.Windows.Forms.Label
-    Friend WithEvents TbMassMass As System.Windows.Forms.TextBox
-    Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
-    Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
-    Friend WithEvents CbAxleConfig As System.Windows.Forms.ComboBox
-    Friend WithEvents TbHDVclass As System.Windows.Forms.TextBox
-    Friend WithEvents Label11 As System.Windows.Forms.Label
-    Friend WithEvents TbLoadingMax As System.Windows.Forms.TextBox
-    Friend WithEvents Label22 As System.Windows.Forms.Label
-    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-    Friend WithEvents GrAirRes As System.Windows.Forms.GroupBox
-    Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
-    Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents BtCdFileOpen As System.Windows.Forms.Button
-    Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader
-    Friend WithEvents PnLoad As System.Windows.Forms.Panel
-    Friend WithEvents LbCdARig As System.Windows.Forms.Label
-    Friend WithEvents LbCdATr As System.Windows.Forms.Label
-    Friend WithEvents TBcwRig As System.Windows.Forms.TextBox
-    Friend WithEvents TBAquersRig As System.Windows.Forms.TextBox
-    Friend WithEvents PnCdARig As System.Windows.Forms.Panel
+	Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents TbMass As System.Windows.Forms.TextBox
+	Friend WithEvents Label2 As System.Windows.Forms.Label
+	Friend WithEvents TbLoad As System.Windows.Forms.TextBox
+	Friend WithEvents Label3 As System.Windows.Forms.Label
+	Friend WithEvents TBcdA As System.Windows.Forms.TextBox
+	Friend WithEvents Label13 As System.Windows.Forms.Label
+	Friend WithEvents TBrdyn As System.Windows.Forms.TextBox
+	Friend WithEvents ButOK As System.Windows.Forms.Button
+	Friend WithEvents ButCancel As System.Windows.Forms.Button
+	Friend WithEvents Label14 As System.Windows.Forms.Label
+	Friend WithEvents Label31 As System.Windows.Forms.Label
+	Friend WithEvents Label35 As System.Windows.Forms.Label
+	Friend WithEvents CbCdMode As System.Windows.Forms.ComboBox
+	Friend WithEvents TbCdFile As System.Windows.Forms.TextBox
+	Friend WithEvents BtCdFileBrowse As System.Windows.Forms.Button
+	Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox
+	Friend WithEvents LbCdMode As System.Windows.Forms.Label
+	Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+	Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
+	Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
+	Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
+	Friend WithEvents GroupBox7 As System.Windows.Forms.GroupBox
+	Friend WithEvents LbRtRatio As System.Windows.Forms.Label
+	Friend WithEvents TbRtRatio As System.Windows.Forms.TextBox
+	Friend WithEvents BtRtBrowse As System.Windows.Forms.Button
+	Friend WithEvents TbRtPath As System.Windows.Forms.TextBox
+	Friend WithEvents CbRtType As System.Windows.Forms.ComboBox
+	Friend WithEvents Label12 As System.Windows.Forms.Label
+	Friend WithEvents Label45 As System.Windows.Forms.Label
+	Friend WithEvents PnRt As System.Windows.Forms.Panel
+	Friend WithEvents Label46 As System.Windows.Forms.Label
+	Friend WithEvents Label50 As System.Windows.Forms.Label
+	Friend WithEvents TbMassExtra As System.Windows.Forms.TextBox
+	Friend WithEvents GroupBox8 As System.Windows.Forms.GroupBox
+	Friend WithEvents ButAxlRem As System.Windows.Forms.Button
+	Friend WithEvents LvRRC As System.Windows.Forms.ListView
+	Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader
+	Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader
+	Friend WithEvents ButAxlAdd As System.Windows.Forms.Button
+	Friend WithEvents CbCat As System.Windows.Forms.ComboBox
+	Friend WithEvents Label5 As System.Windows.Forms.Label
+	Friend WithEvents Label9 As System.Windows.Forms.Label
+	Friend WithEvents TbMassMass As System.Windows.Forms.TextBox
+	Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader
+	Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
+	Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
+	Friend WithEvents CbAxleConfig As System.Windows.Forms.ComboBox
+	Friend WithEvents TbHDVclass As System.Windows.Forms.TextBox
+	Friend WithEvents Label11 As System.Windows.Forms.Label
+	Friend WithEvents TbLoadingMax As System.Windows.Forms.TextBox
+	Friend WithEvents Label22 As System.Windows.Forms.Label
+	Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
+	Friend WithEvents GrAirRes As System.Windows.Forms.GroupBox
+	Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+	Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
+	Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+	Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+	Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+	Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+	Friend WithEvents BtCdFileOpen As System.Windows.Forms.Button
+	Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
+	Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader
+	Friend WithEvents PnLoad As System.Windows.Forms.Panel
+	Friend WithEvents LbCdARig As System.Windows.Forms.Label
+	Friend WithEvents LbCdATr As System.Windows.Forms.Label
+	Friend WithEvents TBcdA2 As System.Windows.Forms.TextBox
+	Friend WithEvents PnCdARig As System.Windows.Forms.Panel
     Friend WithEvents PnAll As System.Windows.Forms.Panel
     Friend WithEvents Label6 As System.Windows.Forms.Label
     Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader
@@ -1061,5 +1014,6 @@ Partial Class F_VEH
     Friend WithEvents PnWheelDiam As System.Windows.Forms.Panel
     Friend WithEvents PicVehicle As System.Windows.Forms.PictureBox
     Friend WithEvents Label8 As System.Windows.Forms.Label
-    Friend WithEvents PnCdATrTr As System.Windows.Forms.Panel
+	Friend WithEvents PnCdATrTr As System.Windows.Forms.Panel
+	Friend WithEvents Label38 As System.Windows.Forms.Label
 End Class
diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb
index 9e0a8a97ba99dc518d59110349ab09a9c61d83f1..e7b6f3096e1189df631bca77e41e292a2932b660 100644
--- a/VECTO/GUI/F_VEH.vb
+++ b/VECTO/GUI/F_VEH.vb
@@ -264,10 +264,8 @@ Public Class F_VEH
 		Me.TbMass.Text = ""
 		Me.TbLoad.Text = ""
 		Me.TBrdyn.Text = ""
-		Me.TBcdTrTr.Text = ""
-		Me.TBAquersTrTr.Text = ""
-		Me.TBcwRig.Text = ""
-		Me.TBAquersRig.Text = ""
+		Me.TBcdA.Text = ""
+		Me.TBcdA2.Text = ""
 
 		Me.CbCdMode.SelectedIndex = 0
 		Me.TbCdFile.Text = ""
@@ -391,10 +389,8 @@ Public Class F_VEH
 
 		Me.CbAxleConfig.SelectedIndex = CType(VEH0.AxleConf, Integer)
 
-		Me.TBcdTrTr.Text = VEH0.Cd0
-		Me.TBAquersTrTr.Text = VEH0.Aquers
-		Me.TBcwRig.Text = VEH0.Cd02
-		Me.TBAquersRig.Text = VEH0.Aquers2
+		Me.TBcdA.Text = VEH0.CdA0
+		Me.TBcdA2.Text = VEH0.CdA02
 
 		DeclInit()
 
@@ -421,12 +417,10 @@ Public Class F_VEH
 		VEH0.MassExtra = CSng(fTextboxToNumString(Me.TbMassExtra.Text))
 		VEH0.Loading = CSng(fTextboxToNumString(Me.TbLoad.Text))
 
-		VEH0.Cd0 = CSng(fTextboxToNumString(Me.TBcdTrTr.Text))
-		VEH0.Aquers = CSng(fTextboxToNumString(Me.TBAquersTrTr.Text))
+		VEH0.CdA0 = CSng(fTextboxToNumString(Me.TBcdA.Text))
 
 		If Me.PnCdARig.Visible Then
-			VEH0.Cd02 = CSng(fTextboxToNumString(Me.TBcwRig.Text))
-			VEH0.Aquers2 = CSng(fTextboxToNumString(Me.TBAquersRig.Text))
+			VEH0.CdA02 = CSng(fTextboxToNumString(Me.TBcdA2.Text))
 		End If
 
 		VEH0.Rim = Me.CbRim.Text
@@ -540,132 +534,132 @@ Public Class F_VEH
 
 #Region "Retarder"
 
-    'Rt Type Change
-    Private Sub CbRtType_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbRtType.SelectedIndexChanged
-        Select Case Me.CbRtType.SelectedIndex
-            Case 1 'Primary
-                Me.LbRtRatio.Text = "Ratio to engine speed"
-                Me.TbRtPath.Enabled = True
-                Me.BtRtBrowse.Enabled = True
-                Me.PnRt.Enabled = True
-            Case 2 'Secondary
-                Me.LbRtRatio.Text = "Ratio to cardan shaft speed"
-                Me.TbRtPath.Enabled = True
-                Me.BtRtBrowse.Enabled = True
-                Me.PnRt.Enabled = True
-            Case Else '0 None
-                Me.LbRtRatio.Text = "Ratio"
-                Me.TbRtPath.Enabled = False
-                Me.BtRtBrowse.Enabled = False
-                Me.PnRt.Enabled = False
-        End Select
+	'Rt Type Change
+	Private Sub CbRtType_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbRtType.SelectedIndexChanged
+		Select Case Me.CbRtType.SelectedIndex
+			Case 1 'Primary
+				Me.LbRtRatio.Text = "Ratio to engine speed"
+				Me.TbRtPath.Enabled = True
+				Me.BtRtBrowse.Enabled = True
+				Me.PnRt.Enabled = True
+			Case 2 'Secondary
+				Me.LbRtRatio.Text = "Ratio to cardan shaft speed"
+				Me.TbRtPath.Enabled = True
+				Me.BtRtBrowse.Enabled = True
+				Me.PnRt.Enabled = True
+			Case Else '0 None
+				Me.LbRtRatio.Text = "Ratio"
+				Me.TbRtPath.Enabled = False
+				Me.BtRtBrowse.Enabled = False
+				Me.PnRt.Enabled = False
+		End Select
 
-        Change()
+		Change()
 
-    End Sub
+	End Sub
 
-    'Rt File Browse
-    Private Sub BtRtBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtRtBrowse.Click
+	'Rt File Browse
+	Private Sub BtRtBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtRtBrowse.Click
 
-        If fbRLM.OpenDialog(fFileRepl(Me.TbRtPath.Text, fPATH(VehFile))) Then TbRtPath.Text = fFileWoDir(fbRLM.Files(0), fPATH(VehFile))
+		If fbRLM.OpenDialog(fFileRepl(Me.TbRtPath.Text, fPATH(VehFile))) Then TbRtPath.Text = fFileWoDir(fbRLM.Files(0), fPATH(VehFile))
 
-    End Sub
+	End Sub
 
 #End Region
 
 #Region "Track changes"
 
-    Private Sub Change()
-        If Not Changed Then
-            Me.LbStatus.Text = "Unsaved changes in current file"
-            Changed = True
-        End If
-    End Sub
-
-    ' "Save changes? "... Returns True if user aborts
-    Private Function ChangeCheckCancel() As Boolean
+	Private Sub Change()
+		If Not Changed Then
+			Me.LbStatus.Text = "Unsaved changes in current file"
+			Changed = True
+		End If
+	End Sub
 
-        If Changed Then
-            Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
-                Case MsgBoxResult.Yes
-                    Return Not SaveOrSaveAs(False)
-                Case MsgBoxResult.Cancel
-                    Return True
-                Case Else 'MsgBoxResult.No
-                    Changed = False
-                    Return False
-            End Select
+	' "Save changes? "... Returns True if user aborts
+	Private Function ChangeCheckCancel() As Boolean
+
+		If Changed Then
+			Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
+				Case MsgBoxResult.Yes
+					Return Not SaveOrSaveAs(False)
+				Case MsgBoxResult.Cancel
+					Return True
+				Case Else 'MsgBoxResult.No
+					Changed = False
+					Return False
+			End Select
 
-        Else
+		Else
 
-            Return False
+			Return False
 
-        End If
+		End If
 
-    End Function
+	End Function
 
-    Private Sub TBmass_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMass.TextChanged
-        SetMaxLoad()
-        Change()
-    End Sub
+	Private Sub TBmass_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMass.TextChanged
+		SetMaxLoad()
+		Change()
+	End Sub
 
-    Private Sub TBston_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbLoad.TextChanged
-        Change()
-    End Sub
+	Private Sub TBston_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbLoad.TextChanged
+		Change()
+	End Sub
 
-    Private Sub TBDreifen_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBrdyn.TextChanged
-        Change()
-    End Sub
+	Private Sub TBDreifen_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBrdyn.TextChanged
+		Change()
+	End Sub
 
-    Private Sub CbRim_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbRim.SelectedIndexChanged
-        Change()
-        DeclInit()
-    End Sub
+	Private Sub CbRim_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbRim.SelectedIndexChanged
+		Change()
+		DeclInit()
+	End Sub
 
-    Private Sub TBcw_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBcdTrTr.TextChanged, TBcwRig.TextChanged
-        Change()
-    End Sub
+	Private Sub TBcw_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBcdA.TextChanged, TBcdA2.TextChanged
+		Change()
+	End Sub
 
-    Private Sub TBAquers_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBAquersTrTr.TextChanged, TBAquersRig.TextChanged
-        Change()
-    End Sub
+	Private Sub TBAquers_TextChanged(sender As System.Object, e As System.EventArgs)
+		Change()
+	End Sub
 
 
-    Private Sub TbCdFile_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbCdFile.TextChanged
-        Change()
-    End Sub
+	Private Sub TbCdFile_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbCdFile.TextChanged
+		Change()
+	End Sub
 
-    Private Sub TbRtPath_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbRtPath.TextChanged
-        Change()
-    End Sub
+	Private Sub TbRtPath_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbRtPath.TextChanged
+		Change()
+	End Sub
 
-    Private Sub TbRtRatio_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbRtRatio.TextChanged
-        Change()
-    End Sub
+	Private Sub TbRtRatio_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbRtRatio.TextChanged
+		Change()
+	End Sub
 
-    Private Sub CbCat_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbCat.SelectedIndexChanged
-        Change()
-        SetHDVclass()
-        DeclInit()
-    End Sub
+	Private Sub CbCat_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbCat.SelectedIndexChanged
+		Change()
+		SetHDVclass()
+		DeclInit()
+	End Sub
 
-    Private Sub TbMassTrailer_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMassExtra.TextChanged
-        SetMaxLoad()
-        Change()
-    End Sub
+	Private Sub TbMassTrailer_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMassExtra.TextChanged
+		SetMaxLoad()
+		Change()
+	End Sub
 
-    Private Sub TbMassMax_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMassMass.TextChanged
-        SetMaxLoad()
-        Change()
-        SetHDVclass()
-        DeclInit()
-    End Sub
+	Private Sub TbMassMax_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbMassMass.TextChanged
+		SetMaxLoad()
+		Change()
+		SetHDVclass()
+		DeclInit()
+	End Sub
 
-    Private Sub CbAxleConfig_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbAxleConfig.SelectedIndexChanged
-        Change()
-        SetHDVclass()
-        DeclInit()
-    End Sub
+	Private Sub CbAxleConfig_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbAxleConfig.SelectedIndexChanged
+		Change()
+		SetHDVclass()
+		DeclInit()
+	End Sub
 
 #End Region
 
diff --git a/VECTO/Input Files/cENG.vb b/VECTO/Input Files/cENG.vb
index 20c460514bf33fd7276ca889b9a1cb94c3379313..960eb26a6ed0d5335ccf3a50138b40bcf1cccd93 100644
--- a/VECTO/Input Files/cENG.vb	
+++ b/VECTO/Input Files/cENG.vb	
@@ -20,7 +20,7 @@ Public Class cENG
     ''' Current format version
     ''' </summary>
     ''' <remarks></remarks>
-    Private Const FormatVersion As Short = 2
+	Private Const FormatVersion As Short = 3
 
     ''' <summary>
     ''' Format version of input file. Defined in ReadFile.
@@ -56,7 +56,8 @@ Public Class cENG
     ''' List of full load/motoring curve files (.vfld)
     ''' </summary>
     ''' <remarks></remarks>
-    Public fFLD As List(Of cSubPath)
+	Public fFLD As cSubPath
+	Public FLD As cFLD
 
     ''' <summary>
     ''' Path to fuel consumption map
@@ -64,16 +65,10 @@ Public Class cENG
     ''' <remarks></remarks>
     Private fMAP As cSubPath
 
-    ''' <summary>
-    ''' List of gear-assignments for the given .vfld files.
-    ''' </summary>
-    ''' <remarks></remarks>
-    Public FLDgears As List(Of String)
-
-    ''' <summary>
-    ''' Directory of engine file. Defined in FilePath property (Set)
-    ''' </summary>
-    ''' <remarks></remarks>
+	''' <summary>
+	''' Directory of engine file. Defined in FilePath property (Set)
+	''' </summary>
+	''' <remarks></remarks>
     Private MyPath As String
 
     ''' <summary>
@@ -127,13 +122,10 @@ Public Class cENG
     ''' <returns>True if successful.</returns>
     ''' <remarks></remarks>
     Public Function CreateFileList() As Boolean
-        Dim sb As cSubPath
 
         MyFileList = New List(Of String)
 
-        For Each sb In Me.fFLD
-            MyFileList.Add(sb.FullPath)
-        Next
+		MyFileList.Add(PathFLD)
 
         MyFileList.Add(PathMAP)
 
@@ -150,7 +142,8 @@ Public Class cENG
     Public Sub New()
         MyPath = ""
         sFilePath = ""
-        fMAP = New cSubPath
+		fMAP = New cSubPath
+		fFLD = New cSubPath
         SetDefault()
     End Sub
 
@@ -166,10 +159,8 @@ Public Class cENG
         Nrated = 0
         Pmax = 0
 
-        fFLD = New List(Of cSubPath)
-        FLDgears = New List(Of String)
-
-        fMAP.Clear()
+		fMAP.Clear()
+		fFLD.Clear()
 
         WHTCurban = 0
         WHTCrural = 0
@@ -185,11 +176,8 @@ Public Class cENG
     ''' <returns>True if successful.</returns>
     ''' <remarks></remarks>
     Public Function SaveFile() As Boolean
-        Dim i As Integer
         Dim JSON As New cJSON
         Dim dic As Dictionary(Of String, Object)
-        Dim dic0 As Dictionary(Of String, Object)
-        Dim ls As List(Of Object)
 
         'Header
         dic = New Dictionary(Of String, Object)
@@ -211,14 +199,7 @@ Public Class cENG
         dic.Add("IdlingSpeed", Nidle)
         dic.Add("Inertia", I_mot)
 
-        ls = New List(Of Object)
-        For i = 0 To fFLD.Count - 1
-            dic0 = New Dictionary(Of String, Object)
-            dic0.Add("Path", fFLD(i).PathOrDummy)
-            dic0.Add("Gears", FLDgears(i))
-            ls.Add(dic0)
-        Next
-        dic.Add("FullLoadCurves", ls)
+		dic.Add("FullLoadCurve", fFLD.PathOrDummy)
 
         dic.Add("FuelMap", fMAP.PathOrDummy)
 
@@ -242,9 +223,7 @@ Public Class cENG
     ''' <remarks></remarks>
     Public Function ReadFile(Optional ByVal ShowMsg As Boolean = True) As Boolean
         Dim MsgSrc As String
-        Dim i As Integer
         Dim JSON As New cJSON
-        Dim dic As Object
 
         MsgSrc = "ENG/ReadFile"
 
@@ -269,21 +248,19 @@ Public Class cENG
             Nidle = JSON.Content("Body")("IdlingSpeed")
             I_mot = JSON.Content("Body")("Inertia")
 
-            i = -1
-            For Each dic In JSON.Content("Body")("FullLoadCurves")
-                i += 1
-                fFLD.Add(New cSubPath)
-                fFLD(i).Init(MyPath, dic("Path"))
-                FLDgears.Add(dic("Gears"))
-            Next
+			If FileVersion < 3 Then
+				fFLD.Init(MyPath, JSON.Content("Body")("FullLoadCurves")(0)("Path"))
+			Else
+				fFLD.Init(MyPath, JSON.Content("Body")("FullLoadCurve"))
+			End If
 
             fMAP.Init(MyPath, JSON.Content("Body")("FuelMap"))
 
-            If Not JSON.Content("Body")("WHTC-Urban") Is Nothing Then
-                WHTCurban = CSng(JSON.Content("Body")("WHTC-Urban"))
-                WHTCrural = CSng(JSON.Content("Body")("WHTC-Rural"))
-                WHTCmw = CSng(JSON.Content("Body")("WHTC-Motorway"))
-            End If
+			If FileVersion > 2 AndAlso Not JSON.Content("Body")("WHTC-Urban") Is Nothing Then
+				WHTCurban = CSng(JSON.Content("Body")("WHTC-Urban"))
+				WHTCrural = CSng(JSON.Content("Body")("WHTC-Rural"))
+				WHTCmw = CSng(JSON.Content("Body")("WHTC-Motorway"))
+			End If
 
         Catch ex As Exception
             If ShowMsg Then WorkerMsg(tMsgID.Err, "Failed to read VECTO file! " & ex.Message, MsgSrc)
@@ -300,85 +277,18 @@ Public Class cENG
     ''' <returns>True if successful.</returns>
     ''' <remarks></remarks>
     Public Function Init() As Boolean
-        Dim fl As cFLD
-        Dim fldgear As Dictionary(Of Integer, String)
-        Dim fldgFromTo As String()
-        Dim str As String
-        Dim i As Integer
-        Dim j As Integer
-        Dim G As Integer
 
         Dim MsgSrc As String
         MsgSrc = "ENG/Init"
 
-        G = Math.Max(GBX.GearCount, 0)
-
-        'Create cFLD instance for each gear (list with gear as index)
-        FLD = New List(Of cFLD)
-
-        If FLDgears.Count = 0 Then
-            WorkerMsg(tMsgID.Err, "No .vfld file defined in Engine file!", MsgSrc, "<GUI>" & sFilePath)
-            Return False
-        End If
-
-        fldgear = New Dictionary(Of Integer, String)
-
-        Try
-            j = -1
-            For Each str In FLDgears
-
-                j += 1
-                If str.Contains("-") Then
-                    fldgFromTo = str.Replace(" ", "").Split("-")
-                Else
-                    fldgFromTo = New String() {str, str}
-                End If
-
-                For i = CInt(fldgFromTo(0)) To CInt(fldgFromTo(1))
-
-                    If i > G Then Exit For
-
-                    If i < 0 Or i > 99 Then
-                        WorkerMsg(tMsgID.Err, "Cannot assign .vfld file to gear " & i & "!", MsgSrc, "<GUI>" & sFilePath)
-                        Return False
-                    End If
-
-                    If fldgear.ContainsKey(i) Then
-                        WorkerMsg(tMsgID.Err, "Multiple .vfld files are assigned to gear " & i & "!", MsgSrc, "<GUI>" & sFilePath)
-                        Return False
-                    End If
-
-                    fldgear.Add(i, PathFLD(j))
-
-                Next
-
-            Next
-        Catch ex As Exception
-            WorkerMsg(tMsgID.Err, "Failed to process engine file '" & sFilePath & "'!", MsgSrc)
-            Return False
-        End Try
-
-        'read .vfld files
-        For i = 0 To G
-
-            If Not fldgear.ContainsKey(i) Then
-                WorkerMsg(tMsgID.Err, "No .vfld file assigned to gear " & i & "!", MsgSrc, "<GUI>" & sFilePath)
-                Return False
-            End If
 
-            FLD.Add(New cFLD)
-            FLD(i).FilePath = fldgear(i)
-
-            Try
-                If Not FLD(i).ReadFile Then Return False 'Error message in ReadFile
-            Catch ex As Exception
-                WorkerMsg(tMsgID.Err, "File read error! (" & fldgear(i) & ")", MsgSrc, fldgear(i))
-                Return False
-            End Try
-
-            If Not FLD(i).Init(Nidle) Then Return False
-
-        Next
+		'read .vfld file
+		FLD = New cFLD
+		FLD.FilePath = PathFLD
+		If Not FLD.ReadFile(False) Then
+			WorkerMsg(tMsgID.Err, "File read error! (" & PathFLD & ")", MsgSrc, PathFLD)
+			Return False
+		End If
 
         'Read FC map
         MAP = New cMAP
@@ -398,12 +308,9 @@ Public Class cENG
         End If
 
 
-        'Special rpms for Shift Model and WHTC de-normalisation
-        fl = FLD(0)
+		Nrated = FLD.fnUrated
 
-        Nrated = fl.fnUrated
-
-        Pmax = fl.Pfull(fl.fnUrated)
+		Pmax = FLD.Pfull(FLD.fnUrated)
 
         Return True
 
@@ -415,13 +322,10 @@ Public Class cENG
     ''' <returns>True if successful.</returns>
     ''' <remarks></remarks>
     Public Function DeclInit() As Boolean
-        Dim f0 As cFLD
 
         I_mot = Declaration.EngInertia(Displ)
 
-        For Each f0 In FLD
-            f0.DeclInit()
-        Next
+		FLD.DeclInit()
 
         Return True
     End Function
@@ -458,26 +362,19 @@ Public Class cENG
         End Set
     End Property
 
-    ''' <summary>
-    ''' Get or set file path (cSubPath) of .vfld file for each gear range.
-    ''' </summary>
-    ''' <param name="x">Index</param>
-    ''' <param name="Original">True= (relative) file path as saved in file; False= full file path</param>
-    ''' <value></value>
-    ''' <returns>Relative or absolute file path for each gear range</returns>
-    ''' <remarks></remarks>
-    Public Property PathFLD(ByVal x As Short, Optional ByVal Original As Boolean = False) As String
-        Get
-            If Original Then
-                Return fFLD(x).OriginalPath
-            Else
-                Return fFLD(x).FullPath
-            End If
-        End Get
-        Set(ByVal value As String)
-            fFLD(x).Init(MyPath, value)
-        End Set
-    End Property
+
+	Public Property PathFLD(Optional ByVal Original As Boolean = False) As String
+		Get
+			If Original Then
+				Return fFLD.OriginalPath
+			Else
+				Return fFLD.FullPath
+			End If
+		End Get
+		Set(ByVal value As String)
+			fFLD.Init(MyPath, value)
+		End Set
+	End Property
 
     ''' <summary>
     ''' Get or set file path (cSubPath) to FC map (.vmap)
diff --git a/VECTO/Input Files/cFLD.vb b/VECTO/Input Files/cFLD.vb
index 6c446ed377f68bdc559d26fdb04a2dc1d9a80cdd..0c8b5047e83c847b076844dbc25a178051a232ff 100644
--- a/VECTO/Input Files/cFLD.vb	
+++ b/VECTO/Input Files/cFLD.vb	
@@ -87,101 +87,106 @@ Public Class cFLD
     ''' </summary>
     ''' <returns>True if successful.</returns>
     ''' <remarks></remarks>   
-    Public Function ReadFile(Optional ByVal ShowMsg As Boolean = True) As Boolean
-        Dim file As cFile_V3
-        Dim line As String()
-        Dim PT1set As Boolean
-        Dim FirstLine As Boolean
-        Dim nU As Double
-        Dim MsgSrc As String
+	Public Function ReadFile(ByVal TqOnly As Boolean, Optional ByVal ShowMsg As Boolean = True) As Boolean
+		Dim file As cFile_V3
+		Dim line As String()
+		Dim PT1set As Boolean
+		Dim FirstLine As Boolean
+		Dim nU As Double
+		Dim MsgSrc As String
 
-        MsgSrc = "Main/ReadInp/FLD"
+		MsgSrc = "Main/ReadInp/FLD"
 
-        'Reset
-        LTq = Nothing
-        LTqDrag = Nothing
-        LnU = Nothing
-        LPT1 = Nothing
-        iDim = -1
+		'Reset
+		LTq = Nothing
+		LTqDrag = Nothing
+		LnU = Nothing
+		LPT1 = Nothing
+		iDim = -1
 
-        'Stop if there's no file
-        If sFilePath = "" OrElse Not IO.File.Exists(sFilePath) Then
-            If ShowMsg Then WorkerMsg(tMsgID.Err, "FLD file '" & sFilePath & "' not found!", MsgSrc)
-            Return False
-        End If
+		'Stop if there's no file
+		If sFilePath = "" OrElse Not IO.File.Exists(sFilePath) Then
+			If ShowMsg Then WorkerMsg(tMsgID.Err, "FLD file '" & sFilePath & "' not found!", MsgSrc)
+			Return False
+		End If
 
-        'Open file
-        file = New cFile_V3
-        If Not file.OpenRead(sFilePath) Then
-            If ShowMsg Then WorkerMsg(tMsgID.Err, "Failed to open file (" & sFilePath & ") !", MsgSrc)
-            file = Nothing
-            Return False
-        End If
+		'Open file
+		file = New cFile_V3
+		If Not file.OpenRead(sFilePath) Then
+			If ShowMsg Then WorkerMsg(tMsgID.Err, "Failed to open file (" & sFilePath & ") !", MsgSrc)
+			file = Nothing
+			Return False
+		End If
 
-        'Skip Header
-        file.ReadLine()
+		'Skip Header
+		file.ReadLine()
 
-        'Initialize Lists
-        LTq = New System.Collections.Generic.List(Of Single)
-        LTqDrag = New System.Collections.Generic.List(Of Single)
-        LnU = New System.Collections.Generic.List(Of Single)
-        LPT1 = New System.Collections.Generic.List(Of Single)
+		'Initialize Lists
+		LTq = New System.Collections.Generic.List(Of Single)
+		LTqDrag = New System.Collections.Generic.List(Of Single)
+		LnU = New System.Collections.Generic.List(Of Single)
+		LPT1 = New System.Collections.Generic.List(Of Single)
 
-        FirstLine = True
-        Try
+		FirstLine = True
+		Try
 
-            Do While Not file.EndOfFile
+			Do While Not file.EndOfFile
 
-                'Read Line
-                line = file.ReadLine
+				'Read Line
+				line = file.ReadLine
 
-                'VECTO: M => Pe
-                nU = CDbl(line(0))
+				'VECTO: M => Pe
+				nU = CDbl(line(0))
 
-                LnU.Add(nU)
-                LTq.Add(CDbl(line(1)))
-                LTqDrag.Add(CDbl(line(2)))
+				LnU.Add(nU)
+				LTq.Add(CDbl(line(1)))
 
-                If FirstLine Then
-                    PT1set = (UBound(line) > 2)
-                    FirstLine = False
-                End If
+				If TqOnly Then
+					LTqDrag.Add(0)
+				Else
+					LTqDrag.Add(CDbl(line(2)))
+				End If
 
-                'If PT1 not defined, use default value (0)
-                If PT1set Then
-                    LPT1.Add(CSng(line(3)))
-                Else
-                    LPT1.Add(0)
-                End If
+				If FirstLine Then
+					PT1set = (Not TqOnly) AndAlso (UBound(line) > 2)
+					FirstLine = False
+				End If
 
-                'Line-counter up (was reset in ResetMe)
-                iDim += 1
+				'If PT1 not defined, use default value (0)
+				If PT1set Then
+					LPT1.Add(CSng(line(3)))
+				Else
+					LPT1.Add(0)
+				End If
 
+				'Line-counter up (was reset in ResetMe)
+				iDim += 1
 
-            Loop
 
-        Catch ex As Exception
+			Loop
 
-            If ShowMsg Then WorkerMsg(tMsgID.Err, "Error during file read! Line number: " & iDim + 1 & " (" & sFilePath & ")", MsgSrc, sFilePath)
-            GoTo lbEr
+		Catch ex As Exception
 
-        End Try
+			If ShowMsg Then WorkerMsg(tMsgID.Err, "Error during file read! Line number: " & iDim + 1 & " (" & sFilePath & ")", MsgSrc, sFilePath)
+			GoTo lbEr
 
+		End Try
 
-        'Close file
-        file.Close()
 
-        Return True
+		'Close file
+		file.Close()
+
+		Return True
 
 
-        'ERROR-label for clean Abort
+		'ERROR-label for clean Abort
 lbEr:
-        file.Close()
-        file = Nothing
+		file.Close()
+		file = Nothing
 
-        Return False
+		Return False
 
-    End Function
+	End Function
 
     ''' <summary>
     ''' Returns motoring power [kW] for given engine speed
@@ -535,7 +540,20 @@ lbInt:
 
         Return Tm
 
-    End Function
+	End Function
+
+	Public Sub LimitToEng()
+		Dim i As Integer
+		Dim nU As Single
+		Dim TqEng As Single
+
+		For i = 0 To iDim
+			nU = LnU(i)
+			TqEng = ENG.FLD.Tq(nU)
+			If TqEng < LTq(i) Then LTq(i) = TqEng
+		Next
+
+	End Sub
 
     Public Function Init(ByVal Nidle As Single) As Boolean
         Dim Pmax As Single
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index cef2067bb1567a29a050d938e5800fa6bc12b7c1..5503bced92fb8ea34c52d8e8e2126f2d952ea4e9 100644
--- a/VECTO/Input Files/cGBX.vb	
+++ b/VECTO/Input Files/cGBX.vb	
@@ -11,7 +11,7 @@
 Imports System.Collections.Generic
 
 Public Class cGBX
-	Private Const FormatVersion As Short = 4
+	Private Const FormatVersion As Short = 5
 	Private FileVersion As Short
 
 	Private MyPath As String
@@ -33,6 +33,8 @@ Public Class cGBX
 	Public gs_files As List(Of cSubPath)
 	Public Shiftpolygons As List(Of cShiftPolygon)
 
+	Public FldFiles As List(Of cSubPath)
+	Public FLD As List(Of cFLD)
 
 	Public gs_TorqueResv As Single
 	Public gs_SkipGears As Boolean
@@ -115,6 +117,8 @@ Public Class cGBX
 		IsTCgear = New List(Of Boolean)
 		GetrMaps = New List(Of cSubPath)
 		gs_files = New List(Of cSubPath)
+		FldFiles = New List(Of cSubPath)
+		FLD = New List(Of cFLD)
 
 		GetrEffDef = New List(Of Boolean)
 		GetrEff = New List(Of Single)
@@ -178,6 +182,7 @@ Public Class cGBX
 			If i > 0 Then
 				dic0.Add("TCactive", IsTCgear(i))
 				dic0.Add("ShiftPolygon", gs_files(i).PathOrDummy)
+				dic0.Add("FullLoadCurve", FldFiles(i).PathOrDummy)
 			End If
 
 			ls.Add(dic0)
@@ -248,10 +253,12 @@ Public Class cGBX
 
 
 				gs_files.Add(New cSubPath)
+				FldFiles.Add(New cSubPath)
 
 				If i = 0 Then
 					IsTCgear.Add(False)
 					gs_files(i).Init(MyPath, sKey.NoFile)
+					FldFiles(i).Init(MyPath, sKey.NoFile)
 				Else
 					IsTCgear.Add(dic("TCactive"))
 					If FileVersion < 2 Then
@@ -259,6 +266,11 @@ Public Class cGBX
 					Else
 						gs_files(i).Init(MyPath, dic("ShiftPolygon"))
 					End If
+					If FileVersion < 5 Then
+						FldFiles(i).Init(MyPath, sKey.NoFile)
+					Else
+						FldFiles(i).Init(MyPath, dic("FullLoadCurve"))
+					End If
 				End If
 
 			Next
@@ -314,7 +326,7 @@ Public Class cGBX
 		TCon = (gs_Type = tGearbox.Automatic)
 
 		For i = 1 To GearCount()
-			Shiftpolygons(i).SetGenericShiftPoly()
+			Shiftpolygons(i).SetGenericShiftPoly(FLD(i), ENG.Nidle)
 		Next
 
 
@@ -690,6 +702,9 @@ Public Class cGBX
 
 	Public Function GSinit() As Boolean
 		Dim i As Integer
+		Dim MsgSrc As String
+
+		MsgSrc = "GBX/Init"
 
 		'Set Gearbox Type-specific settings
 		If gs_Type <> tGearbox.Custom Then
@@ -709,6 +724,33 @@ Public Class cGBX
 			End If
 		Next
 
+		'Fld
+		For i = 0 To GearCount()
+
+			FLD.Add(New cFLD)
+
+			If FldFile(i) = "" Then
+				FLD(i).FilePath = ENG.FLD.FilePath
+			Else
+				FLD(i).FilePath = FldFile(i)
+			End If
+
+			Try
+				If Not FLD(i).ReadFile(True) Then Return False 'Error message in ReadFile
+			Catch ex As Exception
+				WorkerMsg(tMsgID.Err, "File read error! (" & FldFile(i) & ")", MsgSrc, FldFile(i))
+				Return False
+			End Try
+
+			'If Engine full load is lower than gear's max torque then limit to engine
+			FLD(i).LimitToEng()
+
+
+			If Not FLD(i).Init(ENG.Nidle) Then Return False
+
+		Next
+
+
 		Return True
 	End Function
 
@@ -1193,6 +1235,19 @@ Public Class cGBX
 		End Set
 	End Property
 
+	Public Property FldFile(ByVal x As Short, Optional ByVal Original As Boolean = False) As String
+		Get
+			If Original Then
+				Return FldFiles(x).OriginalPath
+			Else
+				Return FldFiles(x).FullPath
+			End If
+		End Get
+		Set(value As String)
+			FldFiles(x).Init(MyPath, value)
+		End Set
+	End Property
+
 
 	Public Property TCfile(Optional ByVal Original As Boolean = False) As String
 		Get
@@ -1210,7 +1265,6 @@ Public Class cGBX
 
 	Public Class cShiftPolygon
 		Private Filepath As String
-		Public MyGear As Integer
 
 		Public gs_TqUp As New List(Of Single)
 		Public gs_TqDown As New List(Of Single)
@@ -1221,7 +1275,6 @@ Public Class cGBX
 
 		Public Sub New(ByVal Path As String, ByVal Gear As Integer)
 			Filepath = Path
-			MyGear = Gear
 		End Sub
 
 		Public Function ReadFile() As Boolean
@@ -1255,7 +1308,7 @@ Public Class cGBX
 			gs_TqDown.Clear()
 			gs_nUdown.Clear()
 			gs_nUup.Clear()
-			gs_Dup = - 1
+			gs_Dup = -1
 
 			'Read file
 			Try
@@ -1284,7 +1337,7 @@ Public Class cGBX
 		End Function
 
 
-		Public Sub SetGenericShiftPoly(Optional ByRef fld0 As cFLD = Nothing, Optional ByVal nidle As Single = - 1)
+		Public Sub SetGenericShiftPoly(ByVal fld0 As cFLD, ByVal nidle As Single)
 			Dim Tmax As Single
 
 			'Clear lists
@@ -1293,17 +1346,14 @@ Public Class cGBX
 			gs_nUdown.Clear()
 			gs_nUup.Clear()
 
-			If fld0 Is Nothing Then fld0 = FLD(MyGear)
-			If nidle < 0 Then nidle = ENG.Nidle
-
 			Tmax = fld0.Tmax
 
 			gs_nUdown.Add(nidle)
 			gs_nUdown.Add(nidle)
-			gs_nUdown.Add((fld0.Npref + fld0.Nlo)/2)
+			gs_nUdown.Add((fld0.Npref + fld0.Nlo) / 2)
 
 			gs_TqDown.Add(0)
-			gs_TqDown.Add(Tmax*nidle/(fld0.Npref + fld0.Nlo - nidle))
+			gs_TqDown.Add(Tmax * nidle / (fld0.Npref + fld0.Nlo - nidle))
 			gs_TqDown.Add(Tmax)
 
 			gs_nUup.Add(fld0.Npref)
@@ -1311,7 +1361,7 @@ Public Class cGBX
 			gs_nUup.Add(fld0.N95h)
 
 			gs_TqUp.Add(0)
-			gs_TqUp.Add(Tmax*(fld0.Npref - nidle)/(fld0.N95h - nidle))
+			gs_TqUp.Add(Tmax * (fld0.Npref - nidle) / (fld0.N95h - nidle))
 			gs_TqUp.Add(Tmax)
 
 			gs_Ddown = 2
@@ -1333,9 +1383,9 @@ Public Class cGBX
 			Loop
 
 
-			lbInt:
+lbInt:
 			'Interpolation
-			Return (Tq - gs_TqDown(i - 1))*(gs_nUdown(i) - gs_nUdown(i - 1))/(gs_TqDown(i) - gs_TqDown(i - 1)) + gs_nUdown(i - 1)
+			Return (Tq - gs_TqDown(i - 1)) * (gs_nUdown(i) - gs_nUdown(i - 1)) / (gs_TqDown(i) - gs_TqDown(i - 1)) + gs_nUdown(i - 1)
 		End Function
 
 		Public Function fGSnUup(ByVal Tq As Single) As Single
@@ -1353,9 +1403,9 @@ Public Class cGBX
 			Loop
 
 
-			lbInt:
+lbInt:
 			'Interpolation
-			Return (Tq - gs_TqUp(i - 1))*(gs_nUup(i) - gs_nUup(i - 1))/(gs_TqUp(i) - gs_TqUp(i - 1)) + gs_nUup(i - 1)
+			Return (Tq - gs_TqUp(i - 1)) * (gs_nUup(i) - gs_nUup(i - 1)) / (gs_TqUp(i) - gs_TqUp(i - 1)) + gs_nUup(i - 1)
 		End Function
 	End Class
 End Class
diff --git a/VECTO/Input Files/cSubPath.vb b/VECTO/Input Files/cSubPath.vb
index 9573e4e2ba51fabdaf3dea502d4423b4423a4bd1..93a2d204638d8d729cf3ac84af1989b1da6e60ad 100644
--- a/VECTO/Input Files/cSubPath.vb	
+++ b/VECTO/Input Files/cSubPath.vb	
@@ -12,66 +12,66 @@
 
 Public Class cSubPath
 
-    Private sFullPath As String
-    Private sOglPath As String
-    Private bDefined As Boolean
-
-    Public Sub New()
-        bDefined = False
-    End Sub
-
-    Public Sub Init(ByVal ParentDir As String, ByVal Path As String)
-        If fFileOrNot(Path) = "" Then
-            bDefined = False
-        Else
-            bDefined = True
-            sOglPath = Path
-            sFullPath = fFileRepl(Path, ParentDir)
-        End If
-    End Sub
-
-    Private Function fFileOrNot(ByVal f As String) As String
-        If Trim(UCase(f)) = sKey.NoFile Then
-            Return ""
-        Else
-            Return f
-        End If
-    End Function
-
-
-    Public Sub Clear()
-        bDefined = False
-    End Sub
-
-    Public ReadOnly Property FullPath() As String
-        Get
-            If bDefined Then
-                Return sFullPath
-            Else
-                Return ""
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property OriginalPath() As String
-        Get
-            If bDefined Then
-                Return sOglPath
-            Else
-                Return ""
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property PathOrDummy() As String
-        Get
-            If bDefined Then
-                Return sOglPath
-            Else
-                Return sKey.NoFile
-            End If
-        End Get
-    End Property
+	Private sFullPath As String
+	Private sOglPath As String
+	Private bDefined As Boolean
+
+	Public Sub New()
+		bDefined = False
+	End Sub
+
+	Public Sub Init(ByVal ParentDir As String, ByVal Path As String)
+		If fFileOrNot(Path) = "" Then
+			bDefined = False
+		Else
+			bDefined = True
+			sOglPath = Path
+			sFullPath = fFileRepl(Path, ParentDir)
+		End If
+	End Sub
+
+	Private Function fFileOrNot(ByVal f As String) As String
+		If Trim(UCase(f)) = sKey.NoFile Then
+			Return ""
+		Else
+			Return f
+		End If
+	End Function
+
+
+	Public Sub Clear()
+		bDefined = False
+	End Sub
+
+	Public ReadOnly Property FullPath() As String
+		Get
+			If bDefined Then
+				Return sFullPath
+			Else
+				Return ""
+			End If
+		End Get
+	End Property
+
+	Public ReadOnly Property OriginalPath() As String
+		Get
+			If bDefined Then
+				Return sOglPath
+			Else
+				Return ""
+			End If
+		End Get
+	End Property
+
+	Public ReadOnly Property PathOrDummy() As String
+		Get
+			If bDefined Then
+				Return sOglPath
+			Else
+				Return sKey.NoFile
+			End If
+		End Get
+	End Property
 
 
 
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
index 13bc8a936373560497071228286ccb6879d687ca..18c8c66d33bf4a263323e22c2768c3769fe1d3c9 100644
--- a/VECTO/Input Files/cVEH.vb	
+++ b/VECTO/Input Files/cVEH.vb	
@@ -13,7 +13,7 @@ Imports System.Collections.Generic
 Public Class cVEH
 
     'V2 MassMax is now saved in [t] instead of [kg]
-	Private Const FormatVersion As Short = 6
+	Private Const FormatVersion As Short = 7
     Private FileVersion As Short
 
     Private sFilePath As String
@@ -23,14 +23,9 @@ Public Class cVEH
     Public Loading As Single
     Private siFr0 As Single
 
-    Public Cd0 As Single
-    Public Aquers As Single
-
-    Public Cd02 As Single
-    Public Aquers2 As Single
-
-    Private Cd0Act As Single
-    Private AquersAct As Single
+	Public CdA0 As Single
+	Public CdA02 As Single
+	Private CdA0Act As Single
 
     Public CdMode As tCdMode
     Public CdFile As cSubPath
@@ -104,12 +99,9 @@ Public Class cVEH
         Mass = 0
         MassExtra = 0
         Loading = 0
-        Cd0 = 0
-        Aquers = 0
-        Cd0Act = Cd0
-        AquersAct = Aquers
-        Cd02 = 0
-        Aquers2 = 0
+		CdA0 = 0
+		CdA0Act = CdA0
+		CdA02 = 0
         CdFile.Clear()
         CdMode = tCdMode.ConstCd0
         CdX.Clear()
@@ -181,22 +173,27 @@ Public Class cVEH
             MassMax = JSON.Content("Body")("MassMax")
             If FileVersion < 2 Then MassMax /= 1000
 
-            Cd0 = JSON.Content("Body")("Cd")
-            Aquers = JSON.Content("Body")("CrossSecArea")
+			If FileVersion < 7 Then
+				CdA0 = CSng(JSON.Content("Body")("Cd")) * CSng(JSON.Content("Body")("CrossSecArea"))
+			Else
+				CdA0 = JSON.Content("Body")("CdA")
+			End If
 
-            Cd02 = Cd0
-            Aquers2 = Aquers
+			CdA02 = CdA0
 
-            If FileVersion < 4 Then
-                If Not JSON.Content("Body")("CdRigid") Is Nothing Then Cd02 = JSON.Content("Body")("CdRigid")
-                If Not JSON.Content("Body")("CrossSecAreaRigid") Is Nothing Then Aquers2 = JSON.Content("Body")("CrossSecAreaRigid")
-            Else
-                If Not JSON.Content("Body")("Cd2") Is Nothing Then Cd02 = JSON.Content("Body")("Cd2")
-                If Not JSON.Content("Body")("CrossSecArea2") Is Nothing Then Aquers2 = JSON.Content("Body")("CrossSecArea2")
-            End If
+			If FileVersion < 4 Then
+				If Not JSON.Content("Body")("CdRigid") Is Nothing AndAlso Not JSON.Content("Body")("CrossSecAreaRigid") Is Nothing Then
+					CdA02 = CSng(JSON.Content("Body")("CdRigid")) * CSng(JSON.Content("Body")("CrossSecAreaRigid"))
+				End If
+			ElseIf FileVersion < 7 Then
+				If Not JSON.Content("Body")("Cd2") Is Nothing AndAlso Not JSON.Content("Body")("CrossSecArea2") Is Nothing Then
+					CdA02 = CSng(JSON.Content("Body")("Cd2")) * CSng(JSON.Content("Body")("CrossSecArea2"))
+				End If
+			Else
+				If Not JSON.Content("Body")("CdA2") Is Nothing Then CdA02 = JSON.Content("Body")("CdA2")
+			End If
 
-            Cd0Act = Cd0
-            AquersAct = Aquers
+			CdA0Act = CdA0
 
             If FileVersion < 3 Then
                 Itemp = JSON.Content("Body")("WheelsInertia")
@@ -294,13 +291,11 @@ Public Class cVEH
         dic.Add("Loading", Loading)
         dic.Add("MassMax", MassMax)
 
-        dic.Add("Cd", Cd0)
-        dic.Add("CrossSecArea", Aquers)
+		dic.Add("CdA", CdA0)
 
-        If Cd02 > 0 And Aquers2 > 0 Then
-            dic.Add("Cd2", Cd02)
-            dic.Add("CrossSecArea2", Aquers2)
-        End If
+		If CdA02 > 0 Then
+			dic.Add("CdA2", CdA02)
+		End If
 
         dic.Add("rdyn", rdyn)
         dic.Add("Rim", Rim)
@@ -415,17 +410,14 @@ Public Class cVEH
 		If Declaration.SegRef.TrailerOnlyInLongHaul Then
 
 			If MissionID = tMission.LongHaul Then
-				Cd0Act = Cd0
-				AquersAct = Aquers
+				CdA0Act = CdA0
 			Else
-				Cd0Act = Cd02
-				AquersAct = Aquers2
+				CdA0Act = CdA02
 			End If
 
 		Else
 
-			Cd0Act = Cd0
-			AquersAct = Aquers
+			CdA0Act = CdA0
 
 		End If
 
@@ -645,7 +637,6 @@ Public Class cVEH
 		Dim vveh As Single
 		Dim alpha As Single
 		Dim beta As Single
-		Dim CdA0 As Single
 		Dim CdA As Single
 		Dim CdAsum As Single
 		Dim Vwind As Single
@@ -659,7 +650,6 @@ Public Class cVEH
 		Dim DeltaCdA As Single
 		Dim share As Single
 
-		CdA0 = Cd0Act * AquersAct
 		Vwind = cDeclaration.Vwind * 3.6
 
 		Try
@@ -709,7 +699,7 @@ Public Class cVEH
 				End If
 				DeltaCdA = (beta - lBeta(k - 1)) * (lDeltaCdA(k) - lDeltaCdA(k - 1)) / (lBeta(k) - lBeta(k - 1)) + lDeltaCdA(k - 1)
 
-				CdA = CdA0 + DeltaCdA
+				CdA = CdA0Act + DeltaCdA
 
 				If j = 0 OrElse j = 180 Then
 					share = 5 / 180
@@ -734,57 +724,50 @@ Public Class cVEH
 
 	End Function
 
-    Public Function Cd(ByVal x As Single) As Single
-        Return CdIntpol(x) * Cd0Act
+	Public Function CdA_Y(ByVal x As Single) As Single
+		Return CdIntpol(x)
 	End Function
 
-	Public Function CdA(ByVal vveh As Single) As Single
-		Return CdIntpol(vveh)
-	End Function
 
-    Public Function Cd() As Single
-        Return Cd0Act
-    End Function
+	Public Function CdA() As Single
+		Return CdA0Act
+	End Function
 
-    Public Function CrossSecArea() As Single
-        Return AquersAct
-    End Function
+	Private Function CdIntpol(ByVal x As Single) As Single
+		Dim i As Int32
 
-    Private Function CdIntpol(ByVal x As Single) As Single
-        Dim i As Int32
-
-        'Extrapolation for x < x(1)
-        If CdX(0) >= x Then
-            If CdX(0) > x Then
-                If CdMode = tCdMode.CdOfBeta Then
-                    MODdata.ModErrors.CdExtrapol = "β= " & x
-                Else
-                    MODdata.ModErrors.CdExtrapol = "v= " & x
-                End If
-            End If
-            i = 1
-            GoTo lbInt
-        End If
+		'Extrapolation for x < x(1)
+		If CdX(0) >= x Then
+			If CdX(0) > x Then
+				If CdMode = tCdMode.CdOfBeta Then
+					MODdata.ModErrors.CdExtrapol = "β= " & x
+				Else
+					MODdata.ModErrors.CdExtrapol = "v= " & x
+				End If
+			End If
+			i = 1
+			GoTo lbInt
+		End If
 
-        i = 0
-        Do While CdX(i) < x And i < CdDim
-            i += 1
-        Loop
+		i = 0
+		Do While CdX(i) < x And i < CdDim
+			i += 1
+		Loop
 
-        'Extrapolation for x > x(imax)
-        If CdX(i) < x Then
-            If CdMode = tCdMode.CdOfBeta Then
-                MODdata.ModErrors.CdExtrapol = "β= " & x
-            Else
-                MODdata.ModErrors.CdExtrapol = "v= " & x
-            End If
-        End If
+		'Extrapolation for x > x(imax)
+		If CdX(i) < x Then
+			If CdMode = tCdMode.CdOfBeta Then
+				MODdata.ModErrors.CdExtrapol = "β= " & x
+			Else
+				MODdata.ModErrors.CdExtrapol = "v= " & x
+			End If
+		End If
 
 lbInt:
-        'Interpolation
-        Return (x - CdX(i - 1)) * (CdY(i) - CdY(i - 1)) / (CdX(i) - CdX(i - 1)) + CdY(i - 1)
+		'Interpolation
+		Return (x - CdX(i - 1)) * (CdY(i) - CdY(i - 1)) / (CdX(i) - CdX(i - 1)) + CdY(i - 1)
 
-    End Function
+	End Function
 
 #End Region
 
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 7a19b9b8861dc8943ddc09e14f11af72f6dc4857..dce9c86a8018c226a269951ee67e2c33aef3b98b 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -656,10 +656,10 @@ Public Class cMOD
 						s.Append(Sepp & "0" & Sepp & "0")
 					Else
 						If t = 0 Then
-							s.Append(Sepp & nPeToM(.nU(t), FLD(Gear).Pfull(.nU(t))) & Sepp & nPeToM(.nU(t), FLD(Gear).Pdrag(.nU(t))))
+							s.Append(Sepp & nPeToM(.nU(t), GBX.FLD(Gear).Pfull(.nU(t))) & Sepp & nPeToM(.nU(t), ENG.FLD.Pdrag(.nU(t))))
 						Else
 							s.Append(
-								Sepp & nPeToM(.nU(t), FLD(Gear).Pfull(.nU(t), .Pe(t - 1))) & Sepp & nPeToM(.nU(t), FLD(Gear).Pdrag(.nU(t))))
+								Sepp & nPeToM(.nU(t), GBX.FLD(Gear).Pfull(.nU(t), .Pe(t - 1))) & Sepp & nPeToM(.nU(t), ENG.FLD.Pdrag(.nU(t))))
 						End If
 					End If
 
@@ -679,9 +679,9 @@ Public Class cMOD
 					s.Append(Sepp & "-" & Sepp & "-")
 				Else
 					If t = 0 Then
-						s.Append(Sepp & FLD(Gear).Pfull(.nU(t)) & Sepp & FLD(Gear).Pdrag(.nU(t)))
+						s.Append(Sepp & GBX.FLD(Gear).Pfull(.nU(t)) & Sepp & ENG.FLD.Pdrag(.nU(t)))
 					Else
-						s.Append(Sepp & FLD(Gear).Pfull(.nU(t), .Pe(t - 1)) & Sepp & FLD(Gear).Pdrag(.nU(t)))
+						s.Append(Sepp & GBX.FLD(Gear).Pfull(.nU(t), .Pe(t - 1)) & Sepp & ENG.FLD.Pdrag(.nU(t)))
 					End If
 				End If
 
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index aafcc28d469de7193ed7e1b31a12c6a776a04a2c..cfe1a7fe5baad3594d8743703388cff8fb8916d6 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -242,7 +242,7 @@ Public Class cPower
 
 
 			'Full load / motoring
-			Pmin = FLD(Gear).Pdrag(nU)
+			Pmin = ENG.FLD.Pdrag(nU)
 
 			If Vact >= VEC.vMin / 3.6 Then
 
@@ -867,7 +867,7 @@ lbCheck:
 					i = 0
 					Do
 						PminX = Pmin
-						Pmin = FLD(Gear).Pdrag(nU)
+						Pmin = ENG.FLD.Pdrag(nU)
 
 						'Limit Power-drop to 75%
 						P = (MODdata.Pe(jz - 1) - MODdata.PauxSum(jz - 1)) - 0.75 * ((MODdata.Pe(jz - 1) - MODdata.PauxSum(jz - 1)) - Pmin)
@@ -1074,20 +1074,20 @@ lb_nOK:
 
 			Else
 
-				Pmin = FLD(Gear).Pdrag(nU)
+				Pmin = ENG.FLD.Pdrag(nU)
 
 				If jz = 0 Then
-					Pmax = FLD(Gear).Pfull(nU)
+					Pmax = GBX.FLD(Gear).Pfull(nU)
 				Else
-					Pmax = FLD(Gear).Pfull(nU, MODdata.Pe(jz - 1))
+					Pmax = GBX.FLD(Gear).Pfull(nU, MODdata.Pe(jz - 1))
 				End If
 
 				'If Pmax < 0 or Pmin > 0 then Abort with Error!
 				If Pmin >= 0 And P < 0 Then
-					WorkerMsg(tMsgID.Err, "Pe_drag > 0! n= " & nU & " [1/min]", MsgSrc & "/t= " & jz + 1, FLD(Gear).FilePath)
+					WorkerMsg(tMsgID.Err, "Pe_drag > 0! n= " & nU & " [1/min]", MsgSrc & "/t= " & jz + 1, ENG.FLD.FilePath)
 					Return False
 				ElseIf Pmax <= 0 And P > 0 Then
-					WorkerMsg(tMsgID.Err, "Pe_full < 0! n= " & nU & " [1/min]", MsgSrc & "/t= " & jz + 1, FLD(Gear).FilePath)
+					WorkerMsg(tMsgID.Err, "Pe_full < 0! n= " & nU & " [1/min]", MsgSrc & "/t= " & jz + 1, GBX.FLD(Gear).FilePath)
 					Return False
 				End If
 
@@ -1484,20 +1484,20 @@ lb_nOK:
 			If MODdata.nU(t) < ENG.Nidle - 100 Then
 				EngState0 = tEngState.Stopped
 			Else
-				Pmin = FLD(0).Pdrag(MODdata.nU(t))
+				Pmin = ENG.FLD.Pdrag(MODdata.nU(t))
 
 				If t = 0 Then
-					Pmax = FLD(0).Pfull(MODdata.nU(t))
+					Pmax = ENG.FLD.Pfull(MODdata.nU(t))
 				Else
-					Pmax = FLD(0).Pfull(MODdata.nU(t), MODdata.Pe(t - 1))
+					Pmax = ENG.FLD.Pfull(MODdata.nU(t), MODdata.Pe(t - 1))
 				End If
 
 				'If Pmax < 0 or Pmin >  0 then Abort with Error!
 				If Pmin >= 0 AndAlso MODdata.Pe(t) < 0 Then
-					WorkerMsg(tMsgID.Err, "Pe_drag > 0! n= " & MODdata.nU(t) & " [1/min]", MsgSrc & "/t= " & t + 1, FLD(0).FilePath)
+					WorkerMsg(tMsgID.Err, "Pe_drag > 0! n= " & MODdata.nU(t) & " [1/min]", MsgSrc & "/t= " & t + 1, ENG.FLD.FilePath)
 					Return False
 				ElseIf Pmax <= 0 AndAlso MODdata.Pe(t) > 0 Then
-					WorkerMsg(tMsgID.Err, "Pe_full < 0! n= " & MODdata.nU(t) & " [1/min]", MsgSrc & "/t= " & t + 1, FLD(0).FilePath)
+					WorkerMsg(tMsgID.Err, "Pe_full < 0! n= " & MODdata.nU(t) & " [1/min]", MsgSrc & "/t= " & t + 1, ENG.FLD.FilePath)
 					Return False
 				End If
 
@@ -1565,7 +1565,7 @@ lb_nOK:
 
 		Do
 			PminX = Pmin
-			Pmin = FLD(Gear).Pdrag(nU)
+			Pmin = ENG.FLD.Pdrag(nU)
 			'Leistungsabfall limitieren auf Pe(t-1) minus 75% von (Pe(t-1) - Pschlepp) |@@| Limit Power-drop to Pe(t-1) minus 75% of (Pe(t-1) - Pdrag)
 			'   aus Auswertung ETC des Motors mit dem dynamische Volllast parametriert wurde |@@| of the evaluated ETC of the Enginges with the dynamic parametrized Full-load
 			'   Einfluss auf Beschleunigungsvermögen gering (Einfluss durch Pe(t-1) bei dynamischer Volllast mit PT1) |@@| Influence at low acceleration (influence dynamic Full-load through Pe(t-1) with PT1)
@@ -1674,7 +1674,7 @@ lb_nOK:
 
 		vstep = 5
 		nU = fnU(v, Gear, False)
-		Pdrag = FLD(Gear).Pdrag(nU)
+		Pdrag = ENG.FLD.Pdrag(nU)
 
 		'Do not allow positive road gradients     
 		Grad = MODdata.Vh.fGrad(s)
@@ -1713,7 +1713,7 @@ lb_nOK:
 			End If
 
 			nU = fnU(v, Gear, False)
-			Pdrag = FLD(Gear).Pdrag(nU)
+			Pdrag = ENG.FLD.Pdrag(nU)
 
 			LastDiff = Diff
 
@@ -1815,11 +1815,11 @@ lb_nOK:
 				nU = fnU(Vact, Gear, Clutch = tEngClutch.Slipping)
 
 				'full load
-				Pmax = FLD(Gear).Pfull(nU)
+				Pmax = GBX.FLD(Gear).Pfull(nU)
 
 				'power demand - cut at full load / drag so that fGSnnUp and fGSnnDown don't extrapolate
 				Pe = Math.Min(fPeGearMod(Gear, t, Grad), Pmax)
-				Pe = Math.Max(Pe, FLD(Gear).Pdrag(nU))
+				Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 
 				'torque demand
 				Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
@@ -1849,10 +1849,10 @@ lb_nOK:
 				'rpm at StartSpeed  [m/s]
 				nU = GBX.gs_StartSpeed * 60.0 * GBX.Igetr(0) * GBX.Igetr(Gear) / (2 * VEH.rdyn * Math.PI / 1000)
 
-				If nU > FLD(Gear).fnUrated Then Continue For
+				If nU > GBX.FLD(Gear).fnUrated Then Continue For
 
 				'full load
-				Pmax = FLD(Gear).Pfull(nU)
+				Pmax = GBX.FLD(Gear).Pfull(nU)
 
 				'Max torque
 				MdMax = Pmax * 1000 / (nU * 2 * Math.PI / 60)
@@ -1864,7 +1864,7 @@ lb_nOK:
 				Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 
 				'torque (limited to max)
-				TqX = Math.Min(Tq, FLD(Gear).Tmax)
+				TqX = Math.Min(Tq, GBX.FLD(Gear).Tmax)
 
 				'Up/Downshift rpms
 				nUup = GBX.Shiftpolygons(Gear).fGSnUup(TqX)
@@ -1962,7 +1962,7 @@ lb_nOK:
 		'Upshift
 		If LastGear < GBX.GearCount Then
 
-			TqNext = Math.Min(nPeToM(fnU(Vact, LastGear + 1, False), fPeGearMod(LastGear + 1, t, Grad)), FLD(LastGear + 1).Tq(fnU(Vact, LastGear + 1, False)))
+			TqNext = Math.Min(nPeToM(fnU(Vact, LastGear + 1, False), fPeGearMod(LastGear + 1, t, Grad)), GBX.FLD(LastGear + 1).Tq(fnU(Vact, LastGear + 1, False)))
 			nUup = GBX.Shiftpolygons(LastGear).fGSnUup(TqNext)
 
 			TCaccmin = Math.Min(DEV.TCaccmin, MODdata.Vh.a(t))
@@ -1972,11 +1972,11 @@ lb_nOK:
 				If DEV.TCshiftModeNew Then
 					If _
 						nUnext > nUup AndAlso
-						fPeGearMod(LastGear + 1, t, MODdata.Vh.V(t), TCaccmin, Grad) <= FLD(LastGear + 1).Pfull(nUnext) Then
+						fPeGearMod(LastGear + 1, t, MODdata.Vh.V(t), TCaccmin, Grad) <= GBX.FLD(LastGear + 1).Pfull(nUnext) Then
 						Return LastGear + 1
 					End If
 				Else
-					If nUnext > nUup AndAlso fPeGearMod(LastGear + 1, t, Grad) <= FLD(LastGear + 1).Pfull(nUnext) Then
+					If nUnext > nUup AndAlso fPeGearMod(LastGear + 1, t, Grad) <= GBX.FLD(LastGear + 1).Pfull(nUnext) Then
 						Return LastGear + 1
 					End If
 				End If
@@ -1988,14 +1988,14 @@ lb_nOK:
 
 					If DEV.TCshiftModeNew Then
 						If _
-						 fnUout(Vact, LastGear + 1) > Math.Min(700, iRatio * (FLD(LastGear).N80h - 150)) AndAlso
-						 FLD(LastGear + 1).Pfull(nU * iRatio) >= fPeGearMod(LastGear + 1, t, MODdata.Vh.V(t), TCaccmin, Grad) Then
+						 fnUout(Vact, LastGear + 1) > Math.Min(700, iRatio * (GBX.FLD(LastGear).N80h - 150)) AndAlso
+						 GBX.FLD(LastGear + 1).Pfull(nU * iRatio) >= fPeGearMod(LastGear + 1, t, MODdata.Vh.V(t), TCaccmin, Grad) Then
 							Return LastGear + 1
 						End If
 					Else
 						If _
-						fnUout(Vact, LastGear + 1) > Math.Min(700, iRatio * (FLD(LastGear).N80h - 150)) AndAlso
-						FLD(LastGear + 1).Pfull(nU * iRatio) > 0.7 * FLD(LastGear).Pfull(nU) Then
+						fnUout(Vact, LastGear + 1) > Math.Min(700, iRatio * (GBX.FLD(LastGear).N80h - 150)) AndAlso
+						GBX.FLD(LastGear + 1).Pfull(nU * iRatio) > 0.7 * GBX.FLD(LastGear).Pfull(nU) Then
 							Return LastGear + 1
 						End If
 					End If
@@ -2011,7 +2011,7 @@ lb_nOK:
 		If LastGear > 0 Then
 
 			'Up/Downshift rpms
-			TqCurrent = Math.Min(nPeToM(fnU(Vact, LastGear, False), fPeGearMod(LastGear, t, Grad)), FLD(LastGear).Tq(fnU(Vact, LastGear, False)))
+			TqCurrent = Math.Min(nPeToM(fnU(Vact, LastGear, False), fPeGearMod(LastGear, t, Grad)), GBX.FLD(LastGear).Tq(fnU(Vact, LastGear, False)))
 			nUdown = GBX.Shiftpolygons(LastGear).fGSnUdown(TqCurrent)
 
 			If MinusGearTC Then
@@ -2083,12 +2083,12 @@ lb_nOK:
 			nU = fnU(Vact, LastGear, Clutch = tEngClutch.Slipping)
 
 			'Current power demand with previous gear
-			Pe = Math.Min(fPeGearMod(LastGear, t, Grad), FLD(LastGear).Pfull(nU))
-			Pe = Math.Max(Pe, FLD(LastGear).Pdrag(nU))
+			Pe = Math.Min(fPeGearMod(LastGear, t, Grad), GBX.FLD(LastGear).Pfull(nU))
+			Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 
 			'Current torque demand with previous gear
 			Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
-			MdMax = FLD(LastGear).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
+			MdMax = GBX.FLD(LastGear).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
 
 			'Up/Downshift rpms
 			nnUp = GBX.Shiftpolygons(LastGear).fGSnUup(Tq)
@@ -2111,8 +2111,8 @@ lb_nOK:
 
 				'Continue only if rpm (for lower gear) is above idling
 				If nU >= ENG.Nidle Then
-					Pe = Math.Min(fPeGearMod(Gear - 1, t, Grad), FLD(Gear - 1).Pfull(nU))
-					Pe = Math.Max(Pe, FLD(Gear - 1).Pdrag(nU))
+					Pe = Math.Min(fPeGearMod(Gear - 1, t, Grad), GBX.FLD(Gear - 1).Pfull(nU))
+					Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 					Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 					nnUp = GBX.Shiftpolygons(Gear - 1).fGSnUup(Tq)
 					nnDown = GBX.Shiftpolygons(Gear - 1).fGSnUdown(Tq)
@@ -2132,8 +2132,8 @@ lb_nOK:
 						'Continue only if rpm (for lower gear) is above idling
 						If nU < ENG.Nidle Then Exit Do
 
-						Pe = Math.Min(fPeGearMod(Gear - 1, t, Grad), FLD(Gear - 1).Pfull(nU))
-						Pe = Math.Max(Pe, FLD(Gear - 1).Pdrag(nU))
+						Pe = Math.Min(fPeGearMod(Gear - 1, t, Grad), GBX.FLD(Gear - 1).Pfull(nU))
+						Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 						Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 						nnUp = GBX.Shiftpolygons(Gear - 1).fGSnUup(Tq)
 						nnDown = GBX.Shiftpolygons(Gear - 1).fGSnUdown(Tq)
@@ -2159,14 +2159,14 @@ lb_nOK:
 				'Calculate Shift-rpm for higher gear
 				nU = fnU(Vact, Gear + 1, False)
 
-				Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), FLD(Gear + 1).Pfull(nU))
-				Pe = Math.Max(Pe, FLD(Gear + 1).Pdrag(nU))
+				Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), GBX.FLD(Gear + 1).Pfull(nU))
+				Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 				Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 				nnUp = GBX.Shiftpolygons(Gear + 1).fGSnUup(Tq)
 				nnDown = GBX.Shiftpolygons(Gear + 1).fGSnUdown(Tq)
 
 				'Max Torque
-				MdMax = FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
+				MdMax = GBX.FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
 
 				'Shift up as long as Torque reserve is okay and Gear < Max-Gear and rpm is above DownShift-rpm
 				Do While Gear < GBX.GearCount AndAlso 1 - Tq / MdMax >= GBX.gs_TorqueResv / 100 AndAlso nU > nnDown _
@@ -2184,14 +2184,14 @@ lb_nOK:
 					'Continue only if rpm (for higher gear) is below rated rpm
 					If nU > ENG.Nrated Then Exit Do
 
-					Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), FLD(Gear + 1).Pfull(nU))
-					Pe = Math.Max(Pe, FLD(Gear + 1).Pdrag(nU))
+					Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), GBX.FLD(Gear + 1).Pfull(nU))
+					Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 					Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 					nnUp = GBX.Shiftpolygons(Gear + 1).fGSnUup(Tq)
 					nnDown = GBX.Shiftpolygons(Gear + 1).fGSnUdown(Tq)
 
 					'Max Torque
-					MdMax = FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
+					MdMax = GBX.FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
 
 				Loop
 
@@ -2211,14 +2211,14 @@ lb_nOK:
 
 				'Continue only if rpm (for higher gear) is below rated rpm
 				If nU > ENG.Nidle AndAlso nU <= ENG.Nrated Then
-					Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), FLD(Gear + 1).Pfull(nU))
-					Pe = Math.Max(Pe, FLD(Gear + 1).Pdrag(nU))
+					Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), GBX.FLD(Gear + 1).Pfull(nU))
+					Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 					Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 					nnUp = GBX.Shiftpolygons(Gear + 1).fGSnUup(Tq)
 					nnDown = GBX.Shiftpolygons(Gear + 1).fGSnUdown(Tq)
 
 					'Max Torque
-					MdMax = FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
+					MdMax = GBX.FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
 
 					'Shift up as long as Torque reserve is okay and Gear < Max-Gear and rpm is above DownShift-rpm
 					Do While Gear < GBX.GearCount AndAlso 1 - Tq / MdMax >= GBX.gs_TorqueResv / 100 AndAlso nU > nnDown _
@@ -2236,14 +2236,14 @@ lb_nOK:
 						'Continue only if rpm (for higher gear) is below rated rpm
 						If nU > ENG.Nrated Then Exit Do
 
-						Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), FLD(Gear + 1).Pfull(nU))
-						Pe = Math.Max(Pe, FLD(Gear + 1).Pdrag(nU))
+						Pe = Math.Min(fPeGearMod(Gear + 1, t, Grad), GBX.FLD(Gear + 1).Pfull(nU))
+						Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 						Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 						nnUp = GBX.Shiftpolygons(Gear + 1).fGSnUup(Tq)
 						nnDown = GBX.Shiftpolygons(Gear + 1).fGSnUdown(Tq)
 
 						'Max Torque
-						MdMax = FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
+						MdMax = GBX.FLD(Gear + 1).Pfull(nU, LastPeNorm) * 1000 / (nU * 2 * Math.PI / 60)
 
 					Loop
 
@@ -2259,8 +2259,8 @@ lb10:
 		'Current rpm 
 		nU = fnU(Vact, Gear, Clutch = tEngClutch.Slipping)
 		'Current power demand
-		Pe = Math.Min(fPeGearMod(Gear, t, Grad), FLD(Gear).Pfull(nU))
-		Pe = Math.Max(Pe, FLD(Gear).Pdrag(nU))
+		Pe = Math.Min(fPeGearMod(Gear, t, Grad), GBX.FLD(Gear).Pfull(nU))
+		Pe = Math.Max(Pe, ENG.FLD.Pdrag(nU))
 		'Current torque demand
 		Tq = Pe * 1000 / (nU * 2 * Math.PI / 60)
 
@@ -2384,19 +2384,19 @@ lb10:
 
 			Case tCdMode.ConstCd0
 				vair = v
-				CdA = VEH.Cd * VEH.CrossSecArea
+				CdA = VEH.CdA
 
 			Case tCdMode.CdOfVeng
 				vair = v
-				CdA = VEH.Cd(Vkmh) * VEH.CrossSecArea
+				CdA = VEH.CdA_Y(Vkmh) * VEH.CdA
 
 			Case tCdMode.CdOfVdecl
 				vair = v
-				CdA = VEH.CdA(Vkmh)
+				CdA = VEH.CdA_Y(Vkmh)
 
 			Case Else 'tCdType.CdOfBeta
 				vair = MODdata.Vh.VairVres(t)
-				CdA = VEH.Cd(Math.Abs(MODdata.Vh.VairBeta(t))) * VEH.CrossSecArea
+				CdA = VEH.CdA_Y(Math.Abs(MODdata.Vh.VairBeta(t))) * VEH.CdA
 
 		End Select
 
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index a5a52c23f82912f3b183abdd61457a8b91200864..a4ea54e823815d0952ecd4cbe873355aead553c2 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -177,425 +177,392 @@ lbSkip0:
                 GoTo lbNextJob
             End If
 
-            'WHTC Correction
-            If Cfg.DeclMode Then
+			'Initialise Report
+			If Cfg.DeclMode Then Declaration.ReportInit()
 
-                'Initialise Report
-                Declaration.ReportInit()
 
-                WorkerMsg(tMsgID.Normal, "WHTC Correction", MsgSrc)
+			'BATCH: Create Output-sub-folder
+			If Cfg.BatchMode And Cfg.ModOut And Cfg.BATCHoutSubD Then
+				Select Case UCase(Cfg.BATCHoutpath)
+					Case sKey.JobPath
+						path0 = fPATH(JobFile)
+					Case Else
+						path0 = Cfg.BATCHoutpath
+				End Select
+				path0 &= fFILE(JobFile, False) & "\"
+				If Not IO.Directory.Exists(path0) Then
+					Try
+						IO.Directory.CreateDirectory(path0)
+					Catch ex As Exception
+						WorkerMsg(tMsgID.Err, "Failed to create output directory " & path0 & " !", MsgSrc)
+						JobAbortedByErr = True
+						GoTo lbNextJob
+					End Try
+				End If
+			End If
+
+			'**********************************************************************************************
+			'************************************** Cycle-loop ****************************************
+			'**********************************************************************************************
+			For iCycle = 0 To CyclesDim
 
-                VEC.EngOnly = True
 
-                MODdata.Init()
+				CyclAbrtedByErr = False
 
-                If Not Declaration.WHTCinit Then
-                    JobAbortedByErr = True
-                    GoTo lbNextJob
-                End If
+				If Cfg.BatchMode Then
 
-                MODdata.CycleInit()
+					'ProgBar
+					ProgBarCtrl.ProgLock = True
+					ProgBarCtrl.ProgJobInt = 0
+					ProgBarCtrl.ProgOverallStartInt = 100 * (iJob * (CyclesDim + 1) + iCycle) / ((FilesDim + 1) * (CyclesDim + 1))
+					ProgBarCtrl.PgroOverallEndInt = 100 * (iJob * (CyclesDim + 1) + iCycle + 1) / ((FilesDim + 1) * (CyclesDim + 1))
+					ProgBarCtrl.ProgLock = False
 
-                If Not MODdata.Px.Eng_Calc(True) Then
-                    JobAbortedByErr = True
-                    GoTo lbNextJob
-                End If
 
-                MODdata.FCcalc(False)
-                If MODdata.FCerror Then
-                    WorkerMsg(tMsgID.Err, "WHTC FC calculcation failed!", MsgSrc)
-                    JobAbortedByErr = True
-                    GoTo lbNextJob
-                End If
+					'BATCH mode: Cycles from DRI list
+					CycleFiles.Clear()
+					CycleFiles.Add(fFileRepl(JobCycleList(iCycle)))
 
-                Declaration.WHTCcorrCalc()
+					'Status
+					WorkerMsg(tMsgID.NewJob, "Cycle: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & ((FilesDim + 1) * (CyclesDim + 1)) & " | " & fFILE(JobFile, True) & " | " & fFILE(CycleFiles(0), True), MsgSrc)
+					WorkerStatus("Current Job: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & ((FilesDim + 1) * (CyclesDim + 1)) & " | " & fFILE(JobFile, True) & " | " & fFILE(CycleFiles(0), True))
+					WorkerJobStatus(iJob, "running... " & iCycle + 1 & "/" & (CyclesDim + 1), tJobStatus.Running)
 
-                VEC.EngOnly = False
+					'Output name definition
+					Select Case UCase(Cfg.BATCHoutpath)
+						Case sKey.JobPath
+							path0 = fPATH(JobFile)
+						Case Else
+							path0 = Cfg.BATCHoutpath
+					End Select
 
-            End If
+					If Cfg.BATCHoutSubD Then
+						MODdata.ModOutpName = path0 & fFILE(JobFile, False) & "\" & fFILE(JobFile, False) & "_" & fFILE(CycleFiles(0), False)
+					Else
+						MODdata.ModOutpName = path0 & fFILE(JobFile, False) & "_" & fFILE(CycleFiles(0), False)
+					End If
 
-            'BATCH: Create Output-sub-folder
-            If Cfg.BatchMode And Cfg.ModOut And Cfg.BATCHoutSubD Then
-                Select Case UCase(Cfg.BATCHoutpath)
-                    Case sKey.JobPath
-                        path0 = fPATH(JobFile)
-                    Case Else
-                        path0 = Cfg.BATCHoutpath
-                End Select
-                path0 &= fFILE(JobFile, False) & "\"
-                If Not IO.Directory.Exists(path0) Then
-                    Try
-                        IO.Directory.CreateDirectory(path0)
-                    Catch ex As Exception
-                        WorkerMsg(tMsgID.Err, "Failed to create output directory " & path0 & " !", MsgSrc)
-                        JobAbortedByErr = True
-                        GoTo lbNextJob
-                    End Try
-                End If
-            End If
+				End If
 
-            '**********************************************************************************************
-            '************************************** Cycle-loop ****************************************
-            '**********************************************************************************************
-            For iCycle = 0 To CyclesDim
+				'******************************************************************************************
+				'********************************** VECTO-Cycle-loop START **********************************
+				'******************************************************************************************
+				jsubcycleDim = CycleFiles.Count - 1
 
+				If jsubcycleDim = -1 Then
+					WorkerMsg(tMsgID.Err, "No driving cycle defined!", MsgSrc)
+					JobAbortedByErr = True
+					GoTo lbNextJob
+				End If
 
-                CyclAbrtedByErr = False
+				jsubcycle = -1
+				For Each CurrentCycleFile In CycleFiles
+					jsubcycle += 1
 
-                If Cfg.BatchMode Then
+					ProgBarCtrl.ProgJobInt = 0
 
-                    'ProgBar
-                    ProgBarCtrl.ProgLock = True
-                    ProgBarCtrl.ProgJobInt = 0
-                    ProgBarCtrl.ProgOverallStartInt = 100 * (iJob * (CyclesDim + 1) + iCycle) / ((FilesDim + 1) * (CyclesDim + 1))
-                    ProgBarCtrl.PgroOverallEndInt = 100 * (iJob * (CyclesDim + 1) + iCycle + 1) / ((FilesDim + 1) * (CyclesDim + 1))
-                    ProgBarCtrl.ProgLock = False
 
+					If Not Cfg.BatchMode Then
+						MODdata.ModOutpName = fFileWoExt(JobFile) & "_" & fFILE(CurrentCycleFile, False)
+						WorkerMsg(tMsgID.NewJob, "Cycle: " & (jsubcycle + 1) & " / " & (jsubcycleDim + 1) & " | " & fFILE(CurrentCycleFile, True), MsgSrc)
+					End If
 
-                    'BATCH mode: Cycles from DRI list
-                    CycleFiles.Clear()
-                    CycleFiles.Add(fFileRepl(JobCycleList(iCycle)))
+					If Cfg.DeclMode Then
 
-                    'Status
-                    WorkerMsg(tMsgID.NewJob, "Cycle: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & ((FilesDim + 1) * (CyclesDim + 1)) & " | " & fFILE(JobFile, True) & " | " & fFILE(CycleFiles(0), True), MsgSrc)
-                    WorkerStatus("Current Job: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & ((FilesDim + 1) * (CyclesDim + 1)) & " | " & fFILE(JobFile, True) & " | " & fFILE(CycleFiles(0), True))
-                    WorkerJobStatus(iJob, "running... " & iCycle + 1 & "/" & (CyclesDim + 1), tJobStatus.Running)
+						If Not Declaration.CalcInitCycle(jsubcycle) Then
+							JobAbortedByErr = True
+							GoTo lbNextJob
+						End If
 
-                    'Output name definition
-                    Select Case UCase(Cfg.BATCHoutpath)
-                        Case sKey.JobPath
-                            path0 = fPATH(JobFile)
-                        Case Else
-                            path0 = Cfg.BATCHoutpath
-                    End Select
+						WorkerMsg(tMsgID.Normal, "WHTC Correction Factor: " & Declaration.WHTCcorrFactor, MsgSrc)
 
-                    If Cfg.BATCHoutSubD Then
-                        MODdata.ModOutpName = path0 & fFILE(JobFile, False) & "\" & fFILE(JobFile, False) & "_" & fFILE(CycleFiles(0), False)
-                    Else
-                        MODdata.ModOutpName = path0 & fFILE(JobFile, False) & "_" & fFILE(CycleFiles(0), False)
-                    End If
+						Declaration.ReportAddCycle()
 
-                End If
+					End If
 
-                '******************************************************************************************
-                '********************************** VECTO-Cycle-loop START **********************************
-                '******************************************************************************************
-                jsubcycleDim = CycleFiles.Count - 1
 
-                If jsubcycleDim = -1 Then
-                    WorkerMsg(tMsgID.Err, "No driving cycle defined!", MsgSrc)
-                    JobAbortedByErr = True
-                    GoTo lbNextJob
-                End If
+					'**************************************************************************************
+					'***************************** VECTO-loading-loop START *******************************
+					'**************************************************************************************
+					iLoad = -1
+					For Each loading In LoadList
 
-                jsubcycle = -1
-                For Each CurrentCycleFile In CycleFiles
-                    jsubcycle += 1
+						iLoad += 1
 
-                    ProgBarCtrl.ProgJobInt = 0
+						'ProgBar
+						If Not Cfg.BatchMode Then
+							ProgBarCtrl.ProgLock = True
+							ProgBarCtrl.ProgJobInt = 0
+							ProgBarCtrl.ProgOverallStartInt = 100 * iJob / (FilesDim + 1) + 100 * jsubcycle / (jsubcycleDim + 1) * 1 / (FilesDim + 1) + 100 * iLoad / (iLoadDim + 1) * 1 / ((FilesDim + 1) * (jsubcycleDim + 1))
+							ProgBarCtrl.PgroOverallEndInt = 100 * iJob / (FilesDim + 1) + 100 * jsubcycle / (jsubcycleDim + 1) * 1 / (FilesDim + 1) + 100 * (iLoad + 1) / (iLoadDim + 1) * 1 / ((FilesDim + 1) * (jsubcycleDim + 1))
+							ProgBarCtrl.ProgLock = False
+							WorkerJobStatus(iJob, "running... " & (iLoad + 1) + jsubcycle * (iLoadDim + 1) & "/" & (jsubcycleDim + 1) * (iLoadDim + 1), tJobStatus.Running)
+						End If
 
 
-                    If Not Cfg.BatchMode Then
-                        MODdata.ModOutpName = fFileWoExt(JobFile) & "_" & fFILE(CurrentCycleFile, False)
-                        WorkerMsg(tMsgID.NewJob, "Cycle: " & (jsubcycle + 1) & " / " & (jsubcycleDim + 1) & " | " & fFILE(CurrentCycleFile, True), MsgSrc)
-                    End If
+						If Cfg.DeclMode Then
 
-                    If Cfg.DeclMode Then
+							'Results filename with loading
+							MODdata.ModOutpName = fFileWoExt(JobFile) & "_" & fFILE(CurrentCycleFile, False) & "_" & ConvLoading(loading)
 
-                        If Not Declaration.CalcInitCycle(jsubcycle) Then
-                            JobAbortedByErr = True
-                            GoTo lbNextJob
-                        End If
+							WorkerMsg(tMsgID.NewJob, "Loading: " & (iLoad + 1) & " / " & (iLoadDim + 1) & " | " & ConvLoading(loading), MsgSrc)
 
-                        WorkerMsg(tMsgID.Normal, "WHTC Correction Factor: " & Declaration.WHTCcorrFactor, MsgSrc)
+							If Not Declaration.CalcInitLoad(loading) Then
+								JobAbortedByErr = True
+								GoTo lbNextJob
+							End If
 
-                        Declaration.ReportAddCycle()
+							WorkerStatus("Current Job: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & (FilesDim + 1) & " | " & fFILE(JobFile, True) & " | " & Declaration.CurrentMission.NameStr & " | " & ConvLoading(loading))
 
-                    End If
+						Else
 
+							If Not Cfg.BatchMode Then WorkerStatus("Current Job: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & (FilesDim + 1) & " | " & fFILE(JobFile, True) & " | " & fFILE(CurrentCycleFile, True))
 
-                    '**************************************************************************************
-                    '***************************** VECTO-loading-loop START *******************************
-                    '**************************************************************************************
-                    iLoad = -1
-                    For Each loading In LoadList
+						End If
 
-                        iLoad += 1
+						'Clean up
+						MODdata.Init()
 
-                        'ProgBar
-                        If Not Cfg.BatchMode Then
-                            ProgBarCtrl.ProgLock = True
-                            ProgBarCtrl.ProgJobInt = 0
-                            ProgBarCtrl.ProgOverallStartInt = 100 * iJob / (FilesDim + 1) + 100 * jsubcycle / (jsubcycleDim + 1) * 1 / (FilesDim + 1) + 100 * iLoad / (iLoadDim + 1) * 1 / ((FilesDim + 1) * (jsubcycleDim + 1))
-                            ProgBarCtrl.PgroOverallEndInt = 100 * iJob / (FilesDim + 1) + 100 * jsubcycle / (jsubcycleDim + 1) * 1 / (FilesDim + 1) + 100 * (iLoad + 1) / (iLoadDim + 1) * 1 / ((FilesDim + 1) * (jsubcycleDim + 1))
-                            ProgBarCtrl.ProgLock = False
-                            WorkerJobStatus(iJob, "running... " & (iLoad + 1) + jsubcycle * (iLoadDim + 1) & "/" & (jsubcycleDim + 1) * (iLoadDim + 1), tJobStatus.Running)
-                        End If
+						'Read cycle
+						DRI = New cDRI
+						DRI.FilePath = CurrentCycleFile
+						If Not DRI.ReadFile Then
+							CyclAbrtedByErr = True
+							GoTo lbAusg
+						End If
 
+						'Grad to Alt
+						DRI.GradToAlt()
 
-                        If Cfg.DeclMode Then
+						'Convert v(s) into v(t) (optional)
+						If DRI.Scycle Then
 
-                            'Results filename with loading
-                            MODdata.ModOutpName = fFileWoExt(JobFile) & "_" & fFILE(CurrentCycleFile, False) & "_" & ConvLoading(loading)
+							MODdata.Vh.SetAlt()
 
-                            WorkerMsg(tMsgID.NewJob, "Loading: " & (iLoad + 1) & " / " & (iLoadDim + 1) & " | " & ConvLoading(loading), MsgSrc)
 
-                            If Not Declaration.CalcInitLoad(loading) Then
-                                JobAbortedByErr = True
-                                GoTo lbNextJob
-                            End If
+							If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle (v(s) => v(t))", MsgSrc)
 
-                            WorkerStatus("Current Job: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & (FilesDim + 1) & " | " & fFILE(JobFile, True) & " | " & Declaration.CurrentMission.NameStr & " | " & ConvLoading(loading))
+							If Not DRI.ConvStoT() Then
+								CyclAbrtedByErr = True
+								GoTo lbAusg
+							End If
+						End If
 
-                        Else
+						'If first time step is Zero then duplicate first values to start cycle with vehicle standing.
+						If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 AndAlso DRI.Values(tDriComp.V)(1) >= 0.0001 Then
+							DRI.FirstZero()
+						End If
 
-                            If Not Cfg.BatchMode Then WorkerStatus("Current Job: " & (iJob * (CyclesDim + 1) + iCycle + 1) & " / " & (FilesDim + 1) & " | " & fFILE(JobFile, True) & " | " & fFILE(CurrentCycleFile, True))
+						'Convert to 1Hz (optional) - does not apply to v(s) cycles because timestep is missing
+						If DRI.Tvorg Then
+							If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle to 1Hz", MsgSrc)
+							If Not DRI.ConvTo1Hz() Then
+								'Error-notification in DRI.Convert()
+								CyclAbrtedByErr = True
+								GoTo lbAusg
+							End If
+						End If
 
-                        End If
 
-                        'Clean up
-                        MODdata.Init()
+						'----------------------------------------------------------------------------
+						'----------------------------------------------------------------------------
 
-                        'Read cycle
-                        DRI = New cDRI
-                        DRI.FilePath = CurrentCycleFile
-                        If Not DRI.ReadFile Then
-                            CyclAbrtedByErr = True
-                            GoTo lbAusg
-                        End If
+						'Initialize Cycle-specs (Speed, Accel, ...)
+						MODdata.CycleInit()
 
-                        'Grad to Alt
-                        DRI.GradToAlt()
+						If VEC.EngOnly Then
 
-                        'Convert v(s) into v(t) (optional)
-                        If DRI.Scycle Then
+							If MsgOut Then WorkerMsg(tMsgID.Normal, "Engine Only Calc", MsgSrc)
 
-                            MODdata.Vh.SetAlt()
+							'Rechne .npi-Leistung in Pe und P_clutch um |@@| Expect Npi-Power into Pe and P_clutch
+							If Not MODdata.Px.Eng_Calc(False) Then
+								CyclAbrtedByErr = True
+								GoTo lbAusg
+							End If
 
+						Else
 
-                            If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle (v(s) => v(t))", MsgSrc)
+							'Init auxiliaries
+							If Not VEC.AuxInit() Then
+								'Error-notification within AuxInit()
+								JobAbortedByErr = True
+								GoTo lbNextJob
+							End If
 
-                            If Not DRI.ConvStoT() Then
-                                CyclAbrtedByErr = True
-                                GoTo lbAusg
-                            End If
-                        End If
+							'CAUTION: VehmodeInit() requires information from VECTO and DRI!
+							If Not VEH.VehmodeInit() Then
+								'Error-notification within VehmodeInit()
+								JobAbortedByErr = True
+								GoTo lbNextJob
+							End If
 
-                        'If first time step is Zero then duplicate first values to start cycle with vehicle standing.
-                        If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 AndAlso DRI.Values(tDriComp.V)(1) >= 0.0001 Then
-                            DRI.FirstZero()
-                        End If
+							If GBX.TCon Then
+								If Not GBX.TCinit Then
+									'Error-notification within TCinit()
+									JobAbortedByErr = True
+									GoTo lbNextJob
+								End If
+							End If
 
-                        'Convert to 1Hz (optional) - does not apply to v(s) cycles because timestep is missing
-                        If DRI.Tvorg Then
-                            If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle to 1Hz", MsgSrc)
-                            If Not DRI.ConvTo1Hz() Then
-                                'Error-notification in DRI.Convert()
-                                CyclAbrtedByErr = True
-                                GoTo lbAusg
-                            End If
-                        End If
 
+							If MsgOut Then WorkerMsg(tMsgID.Normal, "Driving Cycle Preprocessing", MsgSrc)
+							If DRI.Vvorg Then
+								If Not MODdata.Px.PreRun Then
+									CyclAbrtedByErr = True
+									GoTo lbAusg
+								End If
+							End If
 
-                        '----------------------------------------------------------------------------
-                        '----------------------------------------------------------------------------
+							If VECTOworker.CancellationPending Then GoTo lbAbort
 
-                        'Initialize Cycle-specs (Speed, Accel, ...)
-                        MODdata.CycleInit()
 
-                        If VEC.EngOnly Then
 
-                            If MsgOut Then WorkerMsg(tMsgID.Normal, "Engine Only Calc", MsgSrc)
+							If MsgOut Then WorkerMsg(tMsgID.Normal, "Vehicle Calc", MsgSrc)
 
-                            'Rechne .npi-Leistung in Pe und P_clutch um |@@| Expect Npi-Power into Pe and P_clutch
-                            If Not MODdata.Px.Eng_Calc(False) Then
-                                CyclAbrtedByErr = True
-                                GoTo lbAusg
-                            End If
+							If Not MODdata.Vh.DistCorrInit() Then
+								CyclAbrtedByErr = True
+								GoTo lbAusg
+							End If
 
-                        Else
+							If Not MODdata.Px.Calc() Then
+								CyclAbrtedByErr = True
+								GoTo lbAusg
+							End If
 
-                            'Init auxiliaries
-                            If Not VEC.AuxInit() Then
-                                'Error-notification within AuxInit()
-                                JobAbortedByErr = True
-                                GoTo lbNextJob
-                            End If
 
-                            'CAUTION: VehmodeInit() requires information from VECTO and DRI!
-                            If Not VEH.VehmodeInit() Then
-                                'Error-notification within VehmodeInit()
-                                JobAbortedByErr = True
-                                GoTo lbNextJob
-                            End If
+							If VECTOworker.CancellationPending Then GoTo lbAbort
 
-                            If GBX.TCon Then
-                                If Not GBX.TCinit Then
-                                    'Error-notification within TCinit()
-                                    JobAbortedByErr = True
-                                    GoTo lbNextJob
-                                End If
-                            End If
+							'Calculate CycleKin (for erg/sum, etc.)
+							If DRI.Vvorg Then MODdata.CylceKin.Calc()
 
-                       
-                            If MsgOut Then WorkerMsg(tMsgID.Normal, "Driving Cycle Preprocessing", MsgSrc)
-                            If DRI.Vvorg Then
-                                If Not MODdata.Px.PreRun Then
-                                    CyclAbrtedByErr = True
-                                    GoTo lbAusg
-                                End If
-                            End If
+						End If
+						'----------------------------------------------------------------------------
+						'----------------------------------------------------------------------------
 
-                            If VECTOworker.CancellationPending Then GoTo lbAbort
 
+						If MsgOut Then WorkerMsg(tMsgID.Normal, "FC Interpolation", MsgSrc)
 
+						'Calculate FC
+						MODdata.FCcalc(True)
 
-                            If MsgOut Then WorkerMsg(tMsgID.Normal, "Vehicle Calc", MsgSrc)
+						If VECTOworker.CancellationPending Then GoTo lbAbort
 
-                            If Not MODdata.Vh.DistCorrInit() Then
-                                CyclAbrtedByErr = True
-                                GoTo lbAusg
-                            End If
+						'*** second-by-second output ***
+						If Cfg.ModOut Then
+							If MsgOut Then WorkerMsg(tMsgID.Normal, "Writing modal output", MsgSrc)
+							If Not MODdata.Output() Then
+								CyclAbrtedByErr = True
+								GoTo lbAusg
+							End If
 
-                            If Not MODdata.Px.Calc() Then
-                                CyclAbrtedByErr = True
-                                GoTo lbAusg
-                            End If
+							WorkerMsg(tMsgID.Normal, "Modal Results written to: " & fFILE(MODdata.ModOutpName & ".vmod", True), MsgSrc, MODdata.ModOutpName & ".vmod")
 
+						End If
 
-                            If VECTOworker.CancellationPending Then GoTo lbAbort
 
-                            'Calculate CycleKin (for erg/sum, etc.)
-                            If DRI.Vvorg Then MODdata.CylceKin.Calc()
+lbAusg:
 
-                        End If
-                        '----------------------------------------------------------------------------
-                        '----------------------------------------------------------------------------
+						If VECTOworker.CancellationPending Then GoTo lbAbort
 
+						'Status-Update
+						ProgBarCtrl.ProgLock = True
+						If Cfg.BatchMode Then
+							WorkerProgJobEnd(100 * (iJob * (CyclesDim + 1) + iCycle + 1) / ((FilesDim + 1) * (CyclesDim + 1)))
+						Else
+							WorkerProgJobEnd(100 * iJob / (FilesDim + 1) + 100 * jsubcycle / (jsubcycleDim + 1) * 1 / (FilesDim + 1) + 100 * (iLoad + 1) / (iLoadDim + 1) * 1 / ((FilesDim + 1) * (jsubcycleDim + 1)))
+						End If
 
-                        If MsgOut Then WorkerMsg(tMsgID.Normal, "FC Interpolation", MsgSrc)
+						If Cfg.DeclMode Then
+							Declaration.ReportAddResults()
+						End If
 
-                        'Calculate FC
-                        MODdata.FCcalc(True)
+						'VSUM Output (first Calculation - Initialization & Header)
+						If Not VSUM.WriteVSUM(iJob * (CyclesDim + 1) + iCycle + 1, fFILE(JobFile, True), fFILE(CurrentCycleFile, True), CyclAbrtedByErr) Then GoTo lbErrInJobLoop
 
-                        If VECTOworker.CancellationPending Then GoTo lbAbort
+						'Data Cleanup
+						MODdata.CleanUp()
 
-                        '*** second-by-second output ***
-                        If Cfg.ModOut Then
-                            If MsgOut Then WorkerMsg(tMsgID.Normal, "Writing modal output", MsgSrc)
-                            If Not MODdata.Output() Then
-                                CyclAbrtedByErr = True
-                                GoTo lbAusg
-                            End If
+					Next
 
-                            WorkerMsg(tMsgID.Normal, "Modal Results written to: " & fFILE(MODdata.ModOutpName & ".vmod", True), MsgSrc, MODdata.ModOutpName & ".vmod")
+					'********************************************************************************
+					'******************** END *** VECTO-loading loop *** END ************************
+					'********************************************************************************
 
-                        End If
 
+				Next
 
-lbAusg:
+				'******************************************************************************************
+				'************************* END *** VECTO Cycle-loop *** END *************************
+				'******************************************************************************************
 
-                        If VECTOworker.CancellationPending Then GoTo lbAbort
 
-                        'Status-Update
-                        ProgBarCtrl.ProgLock = True
-                        If Cfg.BatchMode Then
-                            WorkerProgJobEnd(100 * (iJob * (CyclesDim + 1) + iCycle + 1) / ((FilesDim + 1) * (CyclesDim + 1)))
-                        Else
-                            WorkerProgJobEnd(100 * iJob / (FilesDim + 1) + 100 * jsubcycle / (jsubcycleDim + 1) * 1 / (FilesDim + 1) + 100 * (iLoad + 1) / (iLoadDim + 1) * 1 / ((FilesDim + 1) * (jsubcycleDim + 1)))
-                        End If
+			Next
+			'**********************************************************************************************
+			'****************************** END *** Cycle-loop *** END ******************************
+			'**********************************************************************************************
 
-                        If Cfg.DeclMode Then
-                            Declaration.ReportAddResults()
-                        End If
+			If Cfg.DeclMode Then
+				WorkerMsg(tMsgID.Normal, "Writing report file", MsgSrc)
+				If Declaration.WriteReport() Then
+					WorkerMsg(tMsgID.Normal, "Report written to: " & fFILE(Declaration.Report.Filepath, True), MsgSrc, "<RUN>" & Declaration.Report.Filepath)
+				Else
+					WorkerMsg(tMsgID.Err, "Failed to write pdf report!", MsgSrc)
+					JobAbortedByErr = True
+					GoTo lbNextJob
+				End If
+			End If
 
-                        'VSUM Output (first Calculation - Initialization & Header)
-                        If Not VSUM.WriteVSUM(iJob * (CyclesDim + 1) + iCycle + 1, fFILE(JobFile, True), fFILE(CurrentCycleFile, True), CyclAbrtedByErr) Then GoTo lbErrInJobLoop
+lbNextJob:
 
-                        'Data Cleanup
-                        MODdata.CleanUp()
+			If JobAbortedByErr Or (CyclAbrtedByErr And CyclesDim = 0) Then
 
-                    Next
+				If JobAbortedByErr Then
+					If CInt(iJob * (CyclesDim + 1) + 1) = CInt((iJob + 1) * (CyclesDim + 1)) Then
+						VSUM.WriteVSUM(((iJob + 1) * (CyclesDim + 1)).ToString, fFILE(JobFile, True), "-", True)
+					Else
+						VSUM.WriteVSUM((iJob * (CyclesDim + 1) + 1).ToString & ".." & ((iJob + 1) * (CyclesDim + 1)).ToString, fFILE(JobFile, True), "-", True)
+					End If
+				End If
 
-                    '********************************************************************************
-                    '******************** END *** VECTO-loading loop *** END ************************
-                    '********************************************************************************
+				WorkerJobStatus(iJob, "Aborted due to error!", tJobStatus.Err)
 
+			Else
 
-                Next
+				MsgStrBuilder.Length = 0
+				MsgStrBuilder.Append("done")
+				'If GEN.irechwahl = tCalcMode.cmHEV Then MsgStrBuilder.Append(" (dSOC = " & SOC(MODdata.tDim) - SOC(0) & ")")
 
-                '******************************************************************************************
-                '************************* END *** VECTO Cycle-loop *** END *************************
-                '******************************************************************************************
+				'Add input file list to signature list
+				If VEC.CreateFileList Then
+					For i = 0 To VEC.FileList.Count - 1
+						Lic.FileSigning.AddFile(VEC.FileList(i))
+					Next
+				Else
+					WorkerMsg(tMsgID.Err, "Could not create file list for signing!", MsgSrc)
+				End If
 
+				If MSGwarn > 0 Then
+					MsgStrBuilder.Append(". " & MSGwarn & " Warning")
+					If MSGwarn > 1 Then MsgStrBuilder.Append("s")
+				End If
 
-            Next
-            '**********************************************************************************************
-            '****************************** END *** Cycle-loop *** END ******************************
-            '**********************************************************************************************
+				If MSGerror > 0 Then
+					MsgStrBuilder.Append(". " & MSGerror & " Error")
+					If MSGerror > 1 Then MsgStrBuilder.Append("s")
+				End If
 
-            If Cfg.DeclMode Then
-                WorkerMsg(tMsgID.Normal, "Writing report file", MsgSrc)
-                If Declaration.WriteReport() Then
-                    WorkerMsg(tMsgID.Normal, "Report written to: " & fFILE(Declaration.Report.Filepath, True), MsgSrc, "<RUN>" & Declaration.Report.Filepath)
-                Else
-                    WorkerMsg(tMsgID.Err, "Failed to write pdf report!", MsgSrc)
-                    JobAbortedByErr = True
-                    GoTo lbNextJob
-                End If
-            End If
+				If MSGerror > 0 Then
+					WorkerJobStatus(iJob, MsgStrBuilder.ToString & ".", tJobStatus.Warn)
+				Else
+					WorkerJobStatus(iJob, MsgStrBuilder.ToString & ".", tJobStatus.OK)
+				End If
 
-lbNextJob:
+			End If
 
-            If JobAbortedByErr Or (CyclAbrtedByErr And CyclesDim = 0) Then
-
-                If JobAbortedByErr Then
-                    If CInt(iJob * (CyclesDim + 1) + 1) = CInt((iJob + 1) * (CyclesDim + 1)) Then
-                        VSUM.WriteVSUM(((iJob + 1) * (CyclesDim + 1)).ToString, fFILE(JobFile, True), "-", True)
-                    Else
-                        VSUM.WriteVSUM((iJob * (CyclesDim + 1) + 1).ToString & ".." & ((iJob + 1) * (CyclesDim + 1)).ToString, fFILE(JobFile, True), "-", True)
-                    End If
-                End If
-
-                WorkerJobStatus(iJob, "Aborted due to error!", tJobStatus.Err)
-
-            Else
-
-                MsgStrBuilder.Length = 0
-                MsgStrBuilder.Append("done")
-                'If GEN.irechwahl = tCalcMode.cmHEV Then MsgStrBuilder.Append(" (dSOC = " & SOC(MODdata.tDim) - SOC(0) & ")")
-
-                'Add input file list to signature list
-                If VEC.CreateFileList Then
-                    For i = 0 To VEC.FileList.Count - 1
-                        Lic.FileSigning.AddFile(VEC.FileList(i))
-                    Next
-                Else
-                    WorkerMsg(tMsgID.Err, "Could not create file list for signing!", MsgSrc)
-                End If
-
-                If MSGwarn > 0 Then
-                    MsgStrBuilder.Append(". " & MSGwarn & " Warning")
-                    If MSGwarn > 1 Then MsgStrBuilder.Append("s")
-                End If
-
-                If MSGerror > 0 Then
-                    MsgStrBuilder.Append(". " & MSGerror & " Error")
-                    If MSGerror > 1 Then MsgStrBuilder.Append("s")
-                End If
-
-                If MSGerror > 0 Then
-                    WorkerJobStatus(iJob, MsgStrBuilder.ToString & ".", tJobStatus.Warn)
-                Else
-                    WorkerJobStatus(iJob, MsgStrBuilder.ToString & ".", tJobStatus.OK)
-                End If
+			'Check whether Abort
+			If VECTOworker.CancellationPending Then GoTo lbAbort
 
-            End If
-
-            'Check whether Abort
-            If VECTOworker.CancellationPending Then GoTo lbAbort
-
-        Next
+		Next
 
         '**********************************************************************************************
         '******************************* END *** Job loop *** END *******************************
@@ -664,8 +631,7 @@ lbAbort:
 lbExit:
         VEC = Nothing
         VEH = Nothing
-        FLD = Nothing
-        MAP = Nothing
+		MAP = Nothing
         DRI = Nothing
         MODdata = Nothing
         VSUM = Nothing
@@ -771,6 +737,7 @@ lbExit:
         'Check if file was saved in different mode
         If Cfg.DeclMode <> ENG.SavedInDeclMode Then WorkerMsg(tMsgID.Warn, "Engine file was created in " & OtherModeString & " Mode! Some parameters might be missing and cause errors.", MsgSrc, "<GUI>" & VEC.PathENG)
 
+		If Not ENG.Init() Then Return False
 
 
         '-----------------------------    ~GBX~    -----------------------------
@@ -791,10 +758,7 @@ lbExit:
 
         End If
 
-        'Must be called after cGBX.ReadFile because cGBX.GearCount is needed
-        If Not ENG.Init() Then Return False
-
-        'Must be called after cENG.Init because FLD must be loaded
+		'Must be called after cENG.Init because FLD must be loaded
         If Cfg.DeclMode Then
             If Not ENG.DeclInit() Then Return False
         End If
diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
index b2512db355386236a41c15cdf0acb190929ed92b..6f9f65a1f16bc428e77dd4a3699d872a342fa8da 100644
--- a/VECTO/My Project/AssemblyInfo.vb	
+++ b/VECTO/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by entering "*" in them:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.4.0")> 
-<Assembly: AssemblyFileVersion("2.1.4.0")> 
+<Assembly: AssemblyVersion("2.2.0.0")> 
+<Assembly: AssemblyFileVersion("2.2.0.0")> 
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index c867eb82fe3c7a76ea1f3422ec28185465218aa2..68e1b733ebc54ddd7f9b349b7f68636296ea0150 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -121,12 +121,6 @@
     <Compile Include="GUI\F_FileSign.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\F_FLD.Designer.vb">
-      <DependentUpon>F_FLD.vb</DependentUpon>
-    </Compile>
-    <Compile Include="GUI\F_FLD.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="GUI\F_Graph.Designer.vb">
       <DependentUpon>F_Graph.vb</DependentUpon>
     </Compile>
@@ -139,6 +133,12 @@
     <Compile Include="GUI\F_Graph_ChEdit.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="GUI\F_JIRA.Designer.vb">
+      <DependentUpon>F_JIRA.vb</DependentUpon>
+    </Compile>
+    <Compile Include="GUI\F_JIRA.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="GUI\F_Welcome.Designer.vb">
       <DependentUpon>F_Welcome.vb</DependentUpon>
     </Compile>
@@ -282,15 +282,15 @@
     <EmbeddedResource Include="GUI\F_FileSign.resx">
       <DependentUpon>F_FileSign.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\F_FLD.resx">
-      <DependentUpon>F_FLD.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="GUI\F_Graph.resx">
       <DependentUpon>F_Graph.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="GUI\F_Graph_ChEdit.resx">
       <DependentUpon>F_Graph_ChEdit.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="GUI\F_JIRA.resx">
+      <DependentUpon>F_JIRA.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GUI\F_Welcome.resx">
       <DependentUpon>F_Welcome.vb</DependentUpon>
     </EmbeddedResource>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 3f6b1ef950c2c868dd479f4859249ea63b682f4e..ed89253a484497784ca81e51e0e6637d31f7a78b 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -11,7 +11,7 @@
 Imports System.Collections.Generic
 
 Module VECTO_Global
-	Public Const VECTOvers As String = "2.1.4"
+	Public Const VECTOvers As String = "2.2 beta-2"
 	Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
 	Public MyAppPath As String
 	Public MyConfPath As String
@@ -41,7 +41,6 @@ Module VECTO_Global
 	Public GBX As cGBX
 	Public MAP As cMAP
 	Public DRI As cDRI
-	Public FLD As List(Of cFLD)
 	Public MODdata As cMOD
 	Public Lic As vectolic.cLicense
 	Public VSUM As cVSUM
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
index e2d9d00f7a5e165d0bd678f781f6a26663ad66b8..74b329765b9948b0ac06ac9d83c913caaa521666 100644
--- a/VECTO/cDEV.vb
+++ b/VECTO/cDEV.vb
@@ -165,6 +165,15 @@ Public Class cDEV
 		TCaccmin = MyOptions("TCaccMin").SingleVal
 	End Sub
 
+	Public Sub SetDefault()
+		Dim opt0 As cDEVoption
+
+		For Each opt0 In MyOptions.Values
+			opt0.SetDefault()
+		Next
+
+	End Sub
+
 	'Demo for Delegate Function
 	Public Function TestFunction() As String
 		Return "OK...?"
@@ -378,6 +387,24 @@ Public Class cDEVoption
 		sValTextDef = sValText
 	End Sub
 
+	Public Sub SetDefault()
+		Dim si As String = sValTextDef
+
+		If MyConfType = tDEVconfType.tSelection Then
+			Try
+				If sValTextDef(0) = "(" AndAlso sValTextDef.Contains(")") Then
+					si = sValTextDef.Substring(1, sValTextDef.IndexOf(")") - 1)
+				End If
+			Catch ex As Exception
+				Exit Sub
+			End Try
+		End If
+
+		StringToVal(si)
+
+
+	End Sub
+
 	Public Sub DoAction()
 		sValText = ActionDelegate.Invoke()
 	End Sub
@@ -392,7 +419,7 @@ Public Class cDEVoption
 		Try
 			Select Case MyConfType
 				Case tDEVconfType.tAction
-					'??? Darf nicht sein |@@| May not be
+
 					Return False
 
 				Case tDEVconfType.tBoolean
diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb
index a70d8f378f20f6c6168f3e1df176211781bb7bba..c1597cce3f02f4b1c48c48d14e6c62c11aa281f1 100644
--- a/VECTO/cDeclaration.vb
+++ b/VECTO/cDeclaration.vb
@@ -53,7 +53,6 @@ Public Class cDeclaration
 	Private PT1dim As Integer
 
 
-	Public WHTCresults As Dictionary(Of tWHTCpart, Single)
 	Public WHTCcorrFactor As Single
 
 	Public Report As cReport
@@ -897,9 +896,9 @@ Public Class cDeclaration
 
 		CurrentMission = Missions(SegRef.Missions(CycleIndex))
 
-		WHTCcorrFactor = CurrentMission.WHTCWF(tWHTCpart.Urban) * ENG.WHTCurban / Declaration.WHTCresults(tWHTCpart.Urban) _
-			+ CurrentMission.WHTCWF(tWHTCpart.Rural) * ENG.WHTCrural / Declaration.WHTCresults(tWHTCpart.Rural) _
-			+ CurrentMission.WHTCWF(tWHTCpart.Motorway) * ENG.WHTCmw / Declaration.WHTCresults(tWHTCpart.Motorway)
+		WHTCcorrFactor = CurrentMission.WHTCWF(tWHTCpart.Urban) * ENG.WHTCurban _
+			+ CurrentMission.WHTCWF(tWHTCpart.Rural) * ENG.WHTCrural _
+			+ CurrentMission.WHTCWF(tWHTCpart.Motorway) * ENG.WHTCmw
 
 
 		If Not VEH.DeclInitCycle Then Return False
@@ -986,7 +985,7 @@ Public Class cDeclaration
 					Result = False
 				End If
 
-				ESsum -= AuxESpower(EStech)(CurrentMission.MissionID)
+				ESsum += AuxESpower(EStech)(CurrentMission.MissionID)
 
 			Next
 
@@ -1000,7 +999,7 @@ Public Class cDeclaration
 
 		'PS
 		Try
-			AuxPower.Add(sKey.AUX.PneumSys, AuxPSpower(SegRef.HDVclass)(CurrentMission.MissionID) / 1000)
+			AuxPower.Add(sKey.AUX.PneumSys, AuxPSpower(SegRef.HDVclass)(CurrentMission.MissionID))
 		Catch ex As Exception
 			WorkerMsg(tMsgID.Err, "Failed to initialise pneumatic system! " & ex.Message, MsgSrc)
 			Result = False
@@ -1119,105 +1118,6 @@ lbInt:
 	End Function
 
 
-	Public Function WHTCinit() As Boolean
-		Dim path As String
-		Dim file As New cFile_V3
-		Dim line As String()
-		Dim nU As Single
-		Dim Tq As Single
-		Dim MsgSrc As String
-
-		MsgSrc = "WHTCcor/Init"
-
-		path = MyDeclPath & "WHTC.csv"
-		If Not file.OpenRead(path) Then
-			WorkerMsg(tMsgID.Err, "Failed to load WHTC cycle!", MsgSrc)
-			Return False
-		End If
-
-		DRI = New cDRI
-		DRI.Values = New Dictionary(Of tDriComp, List(Of Double))
-		DRI.Values.Add(tDriComp.nU, New List(Of Double))
-		DRI.Values.Add(tDriComp.Pe, New List(Of Double))
-		DRI.Nvorg = True
-		DRI.Pvorg = True
-
-		'Skip header
-		file.ReadLine()
-
-		Do While Not file.EndOfFile
-			line = file.ReadLine
-
-			nU = line(1)
-			Tq = line(2)
-
-			'Denorm
-			nU = nU * 0.01 * (0.45 * FLD(0).Nlo + 0.45 * FLD(0).Npref + 0.1 * FLD(0).Nhi - ENG.Nidle) * 2.0327 + ENG.Nidle
-
-			If Tq < 0 Then
-				Tq = -90000000000.0
-			Else
-				Tq = Tq * 0.01 * (FLD(0).Tq(nU))
-			End If
-
-			DRI.Values(tDriComp.nU).Add(nU)
-			DRI.Values(tDriComp.Pe).Add(nMtoPe(nU, Tq))
-
-		Loop
-
-		DRI.tDim = DRI.Values(tDriComp.nU).Count - 1
-
-		Return True
-
-	End Function
-
-	Public Sub WHTCcorrCalc()
-		Dim sum As Double
-		Dim Psum As Double
-		Dim i As Integer
-		Dim FC As List(Of Single)
-		Dim MsgSrc As String
-
-		MsgSrc = "WHTCcor/Calc"
-
-		WHTCresults = New Dictionary(Of tWHTCpart, Single)
-
-		FC = MODdata.lFC
-
-
-		'Urban
-		sum = 0
-		Psum = 0
-		For i = 0 To 899
-			sum += FC(i)
-			Psum += Math.Max(0, MODdata.Pe(i))
-		Next
-		WHTCresults.Add(tWHTCpart.Urban, sum / Psum)
-		WorkerMsg(tMsgID.Normal, " > Urban: " & (sum / Psum).ToString("0.0") & " [g/kWh]", MsgSrc)
-
-		'Rural
-		sum = 0
-		Psum = 0
-		For i = 900 To 1379
-			sum += FC(i)
-			Psum += Math.Max(0, MODdata.Pe(i))
-		Next
-		WHTCresults.Add(tWHTCpart.Rural, sum / Psum)
-		WorkerMsg(tMsgID.Normal, " > Rural: " & (sum / Psum).ToString("0.0") & " [g/kWh]", MsgSrc)
-
-		'Motorway
-		sum = 0
-		Psum = 0
-		For i = 1380 To 1799
-			sum += FC(i)
-			Psum += Math.Max(0, MODdata.Pe(i))
-		Next
-		WHTCresults.Add(tWHTCpart.Motorway, sum / Psum)
-		WorkerMsg(tMsgID.Normal, " > Motorway: " & (sum / Psum).ToString("0.0") & " [g/kWh]", MsgSrc)
-
-
-	End Sub
-
 End Class
 
 Public Class cWheel
@@ -1369,7 +1269,7 @@ Public Class cReport
 			a = New System.Windows.Forms.DataVisualization.Charting.ChartArea
 
 			s = New System.Windows.Forms.DataVisualization.Charting.Series
-			s.Points.DataBindXY(FLD(0).LnU, FLD(0).LTq)
+			s.Points.DataBindXY(ENG.FLD.LnU, ENG.FLD.LTq)
 			s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
 			s.BorderWidth = 3
 			s.Color = Color.DarkBlue
@@ -1377,7 +1277,7 @@ Public Class cReport
 			MyChart.Series.Add(s)
 
 			s = New System.Windows.Forms.DataVisualization.Charting.Series
-			s.Points.DataBindXY(FLD(0).LnU, FLD(0).LTqDrag)
+			s.Points.DataBindXY(ENG.FLD.LnU, ENG.FLD.LTqDrag)
 			s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
 			s.BorderWidth = 3
 			s.Color = Color.Blue