diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 00603a6698dbc0c14930752868d08a436bf86e15..189c0dfe03d496770545edcafea1f2d10e8c4d10 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -350,13 +350,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 		///   └┬Wheels
 		///    └┬Brakes
 		///     └┬AxleGear
-		///      └┬(Angledrive)
-		///       └┬(Output Retarder)
-		///        └┬Gearbox, ATGearbox, or APTNGearbox
-		///         └┬(Input Retarder)
-		///          └┬(Clutch when Manual Transmission)
-		///           â””StopStartCombustionEngine
-		///                                    â””(Aux)
+		///      └┬(AxlegearInputRetarder)
+		///       └┬(Angledrive)
+		///        └┬(TransmissionOutputRetarder)
+		///         └┬Gearbox, ATGearbox, or APTNGearbox
+		///          └┬(TransmissionInputRetarder)
+		///           └┬(Clutch)
+		///            â””StopStartCombustionEngine
+		///                                     â””(Aux)
 		/// </code>
 		/// </summary>
 		private IVehicleContainer BuildFullPowertrainConventional(VectoRunData data)
@@ -375,12 +376,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
 				.AddComponent(new Brakes(container))
 				.AddComponent(new AxleGear(container, data.AxleGearData))
+				.AddComponent(data.Retarder.Type == RetarderType.AxlegearInputRetarder ? new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio) : null)
 				.AddComponent(data.AngledriveData != null ? new Angledrive(container, data.AngledriveData) : null)
-				.AddComponent(GetGearbox(container), data.Retarder, container)
+				.AddComponent(data.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio) : null)
+				.AddComponent(GetGearbox(container), container)
+				.AddComponent(data.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, data.Retarder.LossMap, data.Retarder.Ratio) : null)
 				.AddComponent(data.GearboxData.Type.ManualTransmission() ? new Clutch(container, data.EngineData) : null)
 				.AddComponent(engine, idleController)
 				.AddAuxiliaries(container, data);
-
 			return container;
 		}