diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
index 8c4b5d9467fc9de8c168253de67633e521e24a0f..96a5496c2e5141440ff16906fcf3c3554e0503d3 100644
--- a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx	
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx	
@@ -21,7 +21,7 @@
     "StartTqReserve": 20.0,
     "StartSpeed": 2.22222222222222,
     "StartAcc": 0.8,
-    "GearboxType": "AMT",
+    "GearboxType": "IEPC",
     "TorqueConverter": {
       "Enabled": false
     },
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index f0eeab8f8baff1444a04eac4c92116682a461002..1783d6aaaae0051ee8ce52b29bf3979fdc6934ec 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -698,6 +698,12 @@ Public Class VehicleForm
 			    gbEMTorqueLimits.Enabled = False
 			    tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
 
+				'ADAS ---------------------------------------------------------------------
+				cbEngineStopStart.Visible = False
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
+
 				'PTO
 				gbPTO.Enabled = False
 				pnPTO.Enabled = false
@@ -710,6 +716,12 @@ Public Class VehicleForm
 			    gbEMTorqueLimits.Enabled = False
 			    tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
 				
+				'ADAS ---------------------------------------------------------------------
+				cbEngineStopStart.Visible = False
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
+
 			    'PTO
 				gbPTO.Enabled = False
 				pnPTO.Enabled = false
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
index 9fabd9458353d275e6d74db6be0283f0ce31b56a..64ab097e1aea9f8ca1aefffd4e3dc227e0964177 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl{
 
 			container[ModalResultField.P_IEPC_el_, Position] = CurrentState.ElectricPowerToBattery;
 
-			container[ModalResultField.P_IEPC_electricMotorLoss_, Position] = (CurrentState.EmTorqueMap ?? 0.SI<NewtonMeter>()) * avgEMSpeed - CurrentState.ElectricPowerToBattery;
+			container[ModalResultField.P_IEPC_electricMotorLoss_, Position] = (CurrentState.DrivetrainInTorque - CurrentState.DrivetrainOutTorque) * avgDTSpeed - CurrentState.ElectricPowerToBattery;
 
 			//container[ModalResultField.P_EM_TransmissionLoss_, Position] = CurrentState.TransmissionTorqueLoss * avgDTSpeed;