diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index 750a8401465cbf14e06d10c6bafbaa9ca9d96a9a..603f002ab5ed1f3818aeeb49d7ef474d9e4d9472 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -572,8 +572,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		#region Overrides of XMLDeclarationComponentsDataProviderV10
 		
-		public override IAngledriveInputData AngledriveInputData =>
-			ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+		//public override IAngledriveInputData AngledriveInputData =>
+		//	ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
 
 		public override IRetarderInputData RetarderInputData =>
 			ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
@@ -652,8 +652,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		public override IIEPCDeclarationInputData IEPC => null;
 
-		public override IAngledriveInputData AngledriveInputData =>
-			ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+		//public override IAngledriveInputData AngledriveInputData =>
+		//	ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
 
 		public override IRetarderInputData RetarderInputData =>
 			ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
@@ -696,20 +696,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		
 		public XMLDeclarationHeavyLorryHEVIEPCSComponentDataV24(IXMLDeclarationVehicleData vehicle,
 			XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
-		
-		#region Overrides of XMLDeclarationComponentsDataProviderV10
 
-		//public override IRetarderInputData RetarderInputData =>
-		//	ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
+        #region Overrides of XMLDeclarationComponentsDataProviderV10
 
-		//public override IAxleGearInputData AxleGearInputData =>
-		//	ElementExists(XMLNames.Component_Axlegear) ? base.AxleGearInputData : null;
+        //public override IRetarderInputData RetarderInputData =>
+        //	ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
 
-		//public override IAirdragDeclarationInputData AirdragInputData => 
-		//	ElementExists(XMLNames.Component_AirDrag) ? base.AirdragInputData : null;
-		
-		#endregion
-	}
+        public override IAxleGearInputData AxleGearInputData =>
+            ElementExists(XMLNames.Component_Axlegear) ? base.AxleGearInputData : null;
+
+        //public override IAirdragDeclarationInputData AirdragInputData => 
+        //	ElementExists(XMLNames.Component_AirDrag) ? base.AirdragInputData : null;
+
+        #endregion
+    }
 
 	// ---------------------------------------------------------------------------------------
 
@@ -754,8 +754,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		#region Overrides of XMLDeclarationComponentsDataProviderV10
 
-		public override IAngledriveInputData AngledriveInputData =>
-			ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+		//public override IAngledriveInputData AngledriveInputData =>
+		//	ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
 		
 		//public override IRetarderInputData RetarderInputData =>
 		//	ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
@@ -801,14 +801,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public override IBusAuxiliariesDeclarationData BusAuxiliaries  => _busAuxiliariesDeclarationInputData ??
 																 	 (_busAuxiliariesDeclarationInputData = ComponentReader.BusAuxiliariesInputData);
 
-		//public override IAngledriveInputData AngledriveInputData =>
-		//	ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+        //public override IAngledriveInputData AngledriveInputData =>
+        //    ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
 
-		//public override IRetarderInputData RetarderInputData =>
-		//	ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
+        //public override IRetarderInputData RetarderInputData =>
+        //	ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
 
-		#endregion
-	}
+        #endregion
+    }
 
 	// ---------------------------------------------------------------------------------------
 
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs
index 0f3d5b3394bc8ee55eef5af9c06ff81d24a287e4..2431752cf71b94c6ae11906f65f74f9053de3472 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/VehicleDataAdapter.cs
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 				CurbMass = data.CurbMassChassis,
 				GrossVehicleMass = data.GrossVehicleMassRating,
 				AirDensity = Physics.AirDensity,
-				
+				OffVehicleCharging = data.OvcHev
 			};
 
 			return retVal;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs
index fb277f8b0c167bebd870d56ca8bc2620dae0652f..5f22660d9af9cd03a98927ddb59f4496f6c40a95 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -116,6 +116,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.SingleBus
 										DataProvider.CompletedVehicle.TankSystem))
 								.ToList())
 						.ToList();
+					// set vehicle category to completed for single bus simulations to instantiate correct reports (MRF/CIF)
+					//powertrainConfig.VehicleData.InputData = DataProvider.CompletedVehicle;
 				}
 				Report.InitializeReport(powertrainConfig);
 			}