diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
index 279d609a14a8af24bd33c0d4c3f2daf403c9c320..82162f4a15ccdbb7dbd3f38af884bc344ac4106a 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -42,9 +42,12 @@ Public Class IEPCForm
 		cbDifferentialIncluded.Checked = inputData.DifferentialIncluded
 		cbDesignTypeWheelMotor.Checked = inputData.DesignTypeWheelMotor
 		tbNumberOfDesignTypeWheelMotor.Text = inputData.NrOfDesignTypeWheelMotorMeasured.Value.ToGUIFormat()
-		tbThermalOverload.Text = inputData.OverloadRecoveryFactor.ToGUIFormat()
+		
 		tbRatedPower.Text = inputData.R85RatedPower.ConvertToKiloWatt().Value.ToGUIFormat()
 		cbEmType.SelectedValue = inputData.ElectricMachineType
+		if Not Cfg.DeclMode Then
+		    tbThermalOverload.Text = inputData.OverloadRecoveryFactor.ToGUIFormat()
+		End If
 
 		Dim voltageLevel = inputData.VoltageLevels.First()
 		SetFirstVoltageLevel(voltageLevel)
@@ -521,6 +524,9 @@ Public Class IEPCForm
 	End Function
 
 	Private Function ValidateOverloadRecoveryFactor() As Boolean
+		if cfg.DeclMode Then
+			return true
+		End If
 		If Not ValidDoubleValue(tbThermalOverload.Text) Then
 			ShowErrorMessageBox("Thermal Overload Recovery Factor", tbThermalOverload)
 			Return False
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 8877015d4080d4deab3593549ecfa478cc2d96a1..69a254dea13be7070ff0ceb0f21ab90a874e9ed8 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -499,7 +499,11 @@ Public Class VehicleForm
 			For Each entry As IElectricStorageEngineeringInputData In vehicle.Components.ElectricStorage.ElectricStorageElements.OrderBy(Function(x) x.StringId)
 				lvREESSPacks.Items.Add(CreateREESSPackListViewItem(GetRelativePath(entry.REESSPack.DataSource.SourceFile, basePath), entry.Count, entry.StringId))
 			Next
-			tbInitialSoC.Text = (vehicle.InitialSOC * 100).ToGUIFormat()
+			if (cfg.DeclMode) Then 
+				tbInitialSoC.Text = string.Empty
+			Else 
+				tbInitialSoC.Text = (vehicle.InitialSOC * 100).ToGUIFormat()
+			End If
 
 			if (vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) then
 			Dim em As ElectricMachineEntry(Of IElectricMotorEngineeringInputData) = vehicle.Components.ElectricMachines.Entries.First(Function(x) x.Position <> PowertrainPosition.GEN)
diff --git a/VECTO/Input Files/IEPCInputData.vb b/VECTO/Input Files/IEPCInputData.vb
index 72e5b9e6ba2bedc708550369c0d8427089756fc7..2d78c5e3b859f25dd29026f3e08f6490bfdabf0c 100644
--- a/VECTO/Input Files/IEPCInputData.vb	
+++ b/VECTO/Input Files/IEPCInputData.vb	
@@ -49,7 +49,7 @@ Public Class IEPCInputData
         _wheelMotorMeasured = designTypeWheelMotorMeasured
         _nrDesignTypeWheelMotor = nrOfDesignTypeWheelMotorMeasured.ToInt(Nothing)
         _differentialIncluded = differentialIncluded
-        _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble()
+        _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble(0)
 
     End Sub
     
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index c153748e960c72c8191702c389a501fce00528d3..4e76eaa5643a210a5a559f5726de38a49b7b0232 100644
--- a/VECTO/Input Files/VectoJob.vb	
+++ b/VECTO/Input Files/VectoJob.vb	
@@ -551,10 +551,11 @@ Public Class VectoJob
                 If Not vehicleInputData.SavedInDeclarationMode Then
                     result.Add(New ValidationResult("Vehicle File is not in Declaration Mode"))
                 End If
-                If Not engineInputData.SavedInDeclarationMode Then
+                If  Not (vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle OrElse vectoJob.JobType = VectoSimulationJobType.IEPC_E) AndAlso Not engineInputData.SavedInDeclarationMode Then
                     result.Add(New ValidationResult("Engine File is not in Declaration Mode"))
                 End If
-                If Not gearboxInputData.SavedInDeclarationMode Then
+                If Not vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle _ 
+                   AndAlso gearboxInputData IsNot Nothing AndAlso Not gearboxInputData.SavedInDeclarationMode Then
                     result.Add(New ValidationResult("Gearbox File is not in Declaration Mode"))
                 End If
                 If result.Any() Then