diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index e55d23d01d7dca5e806ff107b132dde28279c89a..7522a855aac3a954aeaac866d2efff83c858386f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -38,6 +38,7 @@ using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.Models.Declaration;
 
 namespace TUGraz.VectoCore.InputData.FileIO.JSON
 {
@@ -214,7 +215,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get
 			{
 				return Body["DownshiftAferUpshiftDelay"] == null
-					? 10.SI<Second>()
+					? DeclarationData.Gearbox.DownshiftAfterUpshiftDelay
 					: Body.GetEx<double>("DownshiftAferUpshiftDelay").SI<Second>();
 			}
 		}
@@ -224,7 +225,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get
 			{
 				return Body["UpshiftAfterDownshiftDelay"] == null
-					? 10.SI<Second>()
+					? DeclarationData.Gearbox.UpshiftAfterDownshiftDelay
 					: Body.GetEx<double>("UpshiftAfterDownshiftDelay").SI<Second>();
 			}
 		}
@@ -234,7 +235,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get
 			{
 				return Body["UpshiftMinAcceleration"] == null
-					? 0.1.SI<MeterPerSquareSecond>()
+					? DeclarationData.Gearbox.UpshiftMinAcceleration
 					: Body.GetEx<double>("UpshiftMinAcceleration").SI<MeterPerSquareSecond>();
 			}
 		}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 1f5714cbc1187ac283170dcb5e4b28da7dae1420..8b56fdc4445784c3cea784674a3238a2820ffc7a 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -222,9 +222,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 					});
 			}).ToDictionary(kv => kv.Key, kv => kv.Value);
 
-			retVal.DownshiftAfterUpshiftDelay = 10.SI<Second>();
-			retVal.UpshiftAfterDownshiftDelay = 10.SI<Second>();
-			retVal.UpshiftMinAcceleration = 0.1.SI<MeterPerSquareSecond>();
+			retVal.DownshiftAfterUpshiftDelay = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay;
+			retVal.UpshiftAfterDownshiftDelay = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay;
+			retVal.UpshiftMinAcceleration =DeclarationData.Gearbox.UpshiftMinAcceleration;
 			return retVal;
 		}
 
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index cedc823acadeddbdfbc928de5ac2b6c2110b021d..a002f7698a703d0d19d3a8e8382d3a8866034fb5 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -236,6 +236,9 @@ namespace TUGraz.VectoCore.Models.Declaration
 			private static double ShiftPolygonEngineFldMargin = 0.98;
 
 			public static readonly Second MinTimeBetweenGearshifts = 2.SI<Second>();
+			public static readonly Second DownshiftAfterUpshiftDelay = 10.SI<Second>();
+			public static readonly Second UpshiftAfterDownshiftDelay = 10.SI<Second>();
+			public static readonly MeterPerSquareSecond UpshiftMinAcceleration = 0.1.SI<MeterPerSquareSecond>();
 
 			/// <summary>
 			/// computes the shift polygons for a single gear according to the whitebook 2016