From b1c1e4468c6ec94b5f5d25dc7a658965124ce793 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 21 May 2021 13:29:35 +0200
Subject: [PATCH] switching generic bus vehicles to new XML schema

---
 ...ary_heavyBus group_P31_32_Smart_ES.PIF.xml | 1119 +++++-----
 ...yBus group_P31_32_Smart_ES.PIF_incl TC.xml | 1153 +++++------
 .../vecto_vehicle-completed_heavyBus_31b.xml  |   62 +-
 ...mary_heavyBus group_P33_34_SmartPS.PIF.xml | 1208 +++++------
 .../vecto_vehicle-completed_heavyBus_34f.xml  |   49 +-
 ...heavyBus group P39_40_nonSmart_ESS_PIF.xml | 1120 +++++-----
 .../vecto_vehicle-completed_heavyBus_39a.xml  |   55 +-
 ...primary_heavyBus group_P31_32_Smart_ES.xml |   22 +-
 .../primary_heavyBus group_P33_34_SmartPS.xml |  410 ++--
 ...primary_heavyBus group_P35_36_nonSmart.xml | 1813 +++++++++--------
 ...imary_heavyBus group_P37_38_SmartES_PS.xml |   26 +-
 ...ary_heavyBus group P39_40_nonSmart_ESS.xml |   13 +-
 ...primary_heavyBus group_P31_32_Smart_ES.xml |   26 +-
 .../vecto_vehicle-completed_heavyBus_31b.xml  |   62 +-
 .../primary_heavyBus group_P33_34_SmartPS.xml |  412 ++--
 .../vecto_vehicle-completed_heavyBus_34f.xml  |   49 +-
 ...rimary_heavyBus group P33_34_non_Smart.xml |   13 +-
 17 files changed, 3834 insertions(+), 3778 deletions(-)

diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
index 5fe21e26b2..d05ef500d7 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF.xml	
@@ -1,554 +1,565 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-0cfb413a8bf1457a8dcd">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>4x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>700</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>false</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>7700</Displacement>
-            <RatedSpeed>2200</RatedSpeed>
-            <RatedPower>200000</RatedPower>
-            <MaxEngineTorque>1100</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>700</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
-                <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
-                <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
-                <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
-                <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
-                <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
-                <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
-                <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
-                <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
-                <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
-                <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
-                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>AT 6 Gear</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>APT-S</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>3.364</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>1.909</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>1.421</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>1.000</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>0.720</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>0.615</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 AxleGear</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>6.500</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>true</aux:SmartElectrics>
-              <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
-              <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_nonSmart">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>W1n8NZVFsw4QrL7Dy/rJ1J02Xk4UvfMfBfZ+lO5x2i4=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-0f8290ebb0b8446c9841">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>vo6X6Me6wrxqosr7cAnrliB6kTd8RVmvw5AJ86ezzD4=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.26127</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1411.89</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">23.36173</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1712.46</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.79525</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1157.82</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.17590</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1405.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.24764</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1044.38</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.32635</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1270.06</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13050.44</TotalVehicleMass>
-          <Payload unit="kg">1075.44</Payload>
-          <PassengerCount>15.15</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.66038</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">928.03</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.98543</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1025.16</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.31731</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1489.30</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">24.95584</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1829.32</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.66413</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1221.52</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.46277</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1499.96</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.85984</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1089.26</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">18.25391</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1338.05</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
-          <Payload unit="kg">1075.44</Payload>
-          <PassengerCount>15.15</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.84841</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">941.82</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.17565</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1039.10</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
-          <Payload unit="kg">1094.99</Payload>
-          <PassengerCount>15.42</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.06324</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">810.96</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
-          <Payload unit="kg">2737.48</Payload>
-          <PassengerCount>38.56</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.51205</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">843.86</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
-          <Payload unit="kg">1262.82</Payload>
-          <PassengerCount>17.79</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.25759</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">971.81</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
-          <Payload unit="kg">4209.41</Payload>
-          <PassengerCount>59.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.86026</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1089.29</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
-          <Payload unit="kg">1347.01</Payload>
-          <PassengerCount>18.97</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.54039</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">845.93</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
-          <Payload unit="kg">3367.53</Payload>
-          <PassengerCount>47.43</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.07723</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">885.29</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.2050-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-08-12T12:05:05.0183214Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-0cfb413a8bf1457a8dcd">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-      </di:Transforms>
-      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-      <di:DigestValue>W7emEpfo1jlRFXGEtgmzLL1NyY0CLxWmWXeEAPjXpks=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-0cfb413a8bf1457a8dcd">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_nonSmart</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>4x2</AxleConfiguration>
+				<Articulated>false</Articulated>
+				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+				<IdlingSpeed>700</IdlingSpeed>
+				<RetarderType>Transmission Output Retarder</RetarderType>
+				<RetarderRatio>1.000</RetarderRatio>
+				<AngledriveType>None</AngledriveType>
+				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+				<ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+					<adas:EngineStopStart>false</adas:EngineStopStart>
+					<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+					<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+					<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+				</ADAS>
+				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+					<tcl:Entry gear="6" maxTorque="1800"/>
+					<tcl:Entry gear="1" maxTorque="2500"/>
+				</TorqueLimits>
+				<Components xsi:type="VehicleComponentsPIFType">
+					<Engine>
+						<Data xsi:type="EngineDataPIFType">
+							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 Engine</Model>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>VectoEngine x.y</AppVersion>
+							<Displacement>7700</Displacement>
+							<RatedSpeed>2200</RatedSpeed>
+							<RatedPower>200000</RatedPower>
+							<MaxEngineTorque>1100</MaxEngineTorque>
+							<WHRType>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+							</WHRType>
+							<Mode>
+								<IdlingSpeed>700</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66"/>
+									<Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83"/>
+									<Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44"/>
+									<Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29"/>
+									<Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58"/>
+									<Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88"/>
+									<Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11"/>
+									<Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76"/>
+									<Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36"/>
+									<Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60"/>
+									<Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66"/>
+									<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>AT 6 Gear</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>APT-S</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>3.364</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>1.909</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>1.421</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>1.000</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>0.720</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>0.615</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 AxleGear</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>6.500</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>false</TwinTyres>
+									<Steered>true</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0055</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleDriven</AxleType>
+									<TwinTyres>true</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0063</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>smart</AlternatorTechnology>
+								<SmartAlternator>
+									<RatedCurrent>310</RatedCurrent>
+									<RatedVoltage>48</RatedVoltage>
+								</SmartAlternator>
+								<Battery>
+									<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+									<RatedCapacity>1</RatedCapacity>
+									<NominalVoltage>48</NominalVoltage>
+								</Battery>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>false</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_nonSmart">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>W1n8NZVFsw4QrL7Dy/rJ1J02Xk4UvfMfBfZ+lO5x2i4=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-0f8290ebb0b8446c9841">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>vo6X6Me6wrxqosr7cAnrliB6kTd8RVmvw5AJ86ezzD4=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.26127</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1411.89</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">23.36173</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1712.46</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.79525</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1157.82</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.17590</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1405.63</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.24764</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1044.38</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.32635</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1270.06</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13050.44</TotalVehicleMass>
+						<Payload unit="kg">1075.44</Payload>
+						<PassengerCount>15.15</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.66038</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">928.03</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.98543</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1025.16</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.31731</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1489.30</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">24.95584</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1829.32</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.66413</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1221.52</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.46277</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1499.96</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.85984</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1089.26</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">18.25391</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1338.05</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+						<Payload unit="kg">1075.44</Payload>
+						<PassengerCount>15.15</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.84841</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">941.82</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.17565</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1039.10</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+						<Payload unit="kg">1094.99</Payload>
+						<PassengerCount>15.42</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.06324</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">810.96</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+						<Payload unit="kg">2737.48</Payload>
+						<PassengerCount>38.56</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.51205</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">843.86</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+						<Payload unit="kg">1262.82</Payload>
+						<PassengerCount>17.79</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.25759</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">971.81</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+						<Payload unit="kg">4209.41</Payload>
+						<PassengerCount>59.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.86026</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1089.29</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+						<Payload unit="kg">1347.01</Payload>
+						<PassengerCount>18.97</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.54039</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">845.93</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+						<Payload unit="kg">3367.53</Payload>
+						<PassengerCount>47.43</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.07723</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">885.29</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.2050-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-08-12T12:05:05.0183214Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-0cfb413a8bf1457a8dcd">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>W7emEpfo1jlRFXGEtgmzLL1NyY0CLxWmWXeEAPjXpks=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml
index 58e993b82f..5e21f4db5a 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml	
@@ -1,571 +1,582 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-031eec78fb1746d280d9">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>4x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>700</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>false</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>7700</Displacement>
-            <RatedSpeed>2200</RatedSpeed>
-            <RatedPower>220000</RatedPower>
-            <MaxEngineTorque>1100</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>700</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
-                <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
-                <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
-                <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
-                <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
-                <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
-                <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
-                <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
-                <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
-                <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
-                <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
-                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>AT 6 Gear</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>APT-S</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>3.364</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>1.909</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>1.421</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>1.000</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>0.720</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>0.615</Ratio>
-                <MaxSpeed>2500</MaxSpeed>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-		    <TorqueConverter>
-          <Data xsi:type="TorqueConverterDataPIFType">
-            <Manufacturer>Some Manufacturer</Manufacturer>
-            <Model>Some Model</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>TC CalcApp 123</AppVersion>
-            <Characteristics>
-				<Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='368.37'/>
-				<Entry speedRatio='0.6000' torqueRatio='1.23' inputTorqueRef='294.70'/>
-				<Entry speedRatio='0.9000' torqueRatio='0.95' inputTorqueRef='184.18'/>
-				<Entry speedRatio='1.0000' torqueRatio='0.94' inputTorqueRef='0.00'/>
-				<Entry speedRatio='5.0000' torqueRatio='0.90' inputTorqueRef='-1473.48'/>
-            </Characteristics>
-          </Data>
-        </TorqueConverter> 
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic primary bus 41 AxleGear</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>6.500</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>true</aux:SmartElectrics>
-              <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
-              <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_nonSmart">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>qbkrFYROE5tA+8PnYHcW9bd65Z8HWn1fCwMHHrtSqKY=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-6c34e6e3c0654ca2b66d">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>5tgyq+cWmJLc6jGrNL+vrTKwUvPfffC9L2KQNsN5me0=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.26127</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1411.89</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">23.36173</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1712.46</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.79525</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1157.82</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.17590</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1405.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
-          <Payload unit="kg">1123.63</Payload>
-          <PassengerCount>16.52</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.24764</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1044.38</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
-          <Payload unit="kg">5618.16</Payload>
-          <PassengerCount>82.62</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.32635</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1270.06</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
-          <Payload unit="kg">879.90</Payload>
-          <PassengerCount>12.39</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.56175</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">920.80</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.98543</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1025.16</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.31731</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1489.30</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">24.95584</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1829.32</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.66413</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1221.52</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.46277</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1499.96</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
-          <Payload unit="kg">1193.34</Payload>
-          <PassengerCount>17.55</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.85984</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1089.26</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P31DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
-          <Payload unit="kg">5966.69</Payload>
-          <PassengerCount>87.75</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">18.25391</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1338.05</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
-          <Payload unit="kg">1075.44</Payload>
-          <PassengerCount>15.15</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.84841</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">941.82</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
-          <Payload unit="kg">3519.61</Payload>
-          <PassengerCount>49.57</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.17565</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1039.10</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
-          <Payload unit="kg">1094.99</Payload>
-          <PassengerCount>15.42</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.06324</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">810.96</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
-          <Payload unit="kg">2737.48</Payload>
-          <PassengerCount>38.56</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.51205</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">843.86</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
-          <Payload unit="kg">1262.82</Payload>
-          <PassengerCount>17.79</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.25759</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">971.81</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
-          <Payload unit="kg">4209.41</Payload>
-          <PassengerCount>59.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.86026</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1089.29</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
-          <Payload unit="kg">1347.01</Payload>
-          <PassengerCount>18.97</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.54039</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">845.93</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P32DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
-          <Payload unit="kg">3367.53</Payload>
-          <PassengerCount>47.43</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">12.07723</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">885.29</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-05-11T12:53:35.5309828Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-031eec78fb1746d280d9">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-      </di:Transforms>
-      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-      <di:DigestValue>abc/t5+cWFTVDs6Mg9DmP5sj7khuShNbWtU6Zxi9MGw=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-031eec78fb1746d280d9">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_nonSmart</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>4x2</AxleConfiguration>
+				<Articulated>false</Articulated>
+				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+				<IdlingSpeed>700</IdlingSpeed>
+				<RetarderType>Transmission Output Retarder</RetarderType>
+				<RetarderRatio>1.000</RetarderRatio>
+				<AngledriveType>None</AngledriveType>
+				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+				<ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+					<adas:EngineStopStart>false</adas:EngineStopStart>
+					<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+					<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+					<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+				</ADAS>
+				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+					<tcl:Entry gear="6" maxTorque="1800"/>
+					<tcl:Entry gear="1" maxTorque="2500"/>
+				</TorqueLimits>
+				<Components xsi:type="VehicleComponentsPIFType">
+					<Engine>
+						<Data xsi:type="EngineDataPIFType">
+							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 Engine</Model>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>VectoEngine x.y</AppVersion>
+							<Displacement>7700</Displacement>
+							<RatedSpeed>2200</RatedSpeed>
+							<RatedPower>220000</RatedPower>
+							<MaxEngineTorque>1100</MaxEngineTorque>
+							<WHRType>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+							</WHRType>
+							<Mode>
+								<IdlingSpeed>700</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66"/>
+									<Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83"/>
+									<Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44"/>
+									<Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29"/>
+									<Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58"/>
+									<Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88"/>
+									<Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11"/>
+									<Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76"/>
+									<Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36"/>
+									<Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60"/>
+									<Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66"/>
+									<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>AT 6 Gear</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>APT-S</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>3.364</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>1.909</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>1.421</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>1.000</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>0.720</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>0.615</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<TorqueConverter>
+						<Data xsi:type="TorqueConverterDataPIFType">
+							<Manufacturer>Some Manufacturer</Manufacturer>
+							<Model>Some Model</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>TC CalcApp 123</AppVersion>
+							<Characteristics>
+								<Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='368.37'/>
+								<Entry speedRatio='0.6000' torqueRatio='1.23' inputTorqueRef='294.70'/>
+								<Entry speedRatio='0.9000' torqueRatio='0.95' inputTorqueRef='184.18'/>
+								<Entry speedRatio='1.0000' torqueRatio='0.94' inputTorqueRef='0.00'/>
+								<Entry speedRatio='5.0000' torqueRatio='0.90' inputTorqueRef='-1473.48'/>
+							</Characteristics>
+						</Data>
+					</TorqueConverter>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 AxleGear</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>6.500</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>false</TwinTyres>
+									<Steered>true</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0055</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleDriven</AxleType>
+									<TwinTyres>true</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0063</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>smart</AlternatorTechnology>
+								<SmartAlternator>
+									<RatedCurrent>310</RatedCurrent>
+									<RatedVoltage>48</RatedVoltage>
+								</SmartAlternator>
+								<Battery>
+									<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+									<RatedCapacity>1</RatedCapacity>
+									<NominalVoltage>48</NominalVoltage>
+								</Battery>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>false</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_nonSmart">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>qbkrFYROE5tA+8PnYHcW9bd65Z8HWn1fCwMHHrtSqKY=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-6c34e6e3c0654ca2b66d">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>5tgyq+cWmJLc6jGrNL+vrTKwUvPfffC9L2KQNsN5me0=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.26127</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1411.89</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">23.36173</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1712.46</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.79525</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1157.82</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.17590</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1405.63</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.24764</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1044.38</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.32635</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1270.06</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
+						<Payload unit="kg">879.90</Payload>
+						<PassengerCount>12.39</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.56175</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">920.80</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.98543</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1025.16</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.31731</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1489.30</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">24.95584</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1829.32</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.66413</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1221.52</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.46277</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1499.96</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.85984</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1089.26</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">18.25391</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1338.05</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+						<Payload unit="kg">1075.44</Payload>
+						<PassengerCount>15.15</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.84841</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">941.82</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.17565</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1039.10</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+						<Payload unit="kg">1094.99</Payload>
+						<PassengerCount>15.42</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.06324</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">810.96</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+						<Payload unit="kg">2737.48</Payload>
+						<PassengerCount>38.56</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.51205</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">843.86</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+						<Payload unit="kg">1262.82</Payload>
+						<PassengerCount>17.79</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.25759</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">971.81</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+						<Payload unit="kg">4209.41</Payload>
+						<PassengerCount>59.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.86026</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1089.29</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+						<Payload unit="kg">1347.01</Payload>
+						<PassengerCount>18.97</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.54039</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">845.93</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+						<Payload unit="kg">3367.53</Payload>
+						<PassengerCount>47.43</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.07723</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">885.29</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-05-11T12:53:35.5309828Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-031eec78fb1746d280d9">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>abc/t5+cWFTVDs6Mg9DmP5sj7khuShNbWtU6Zxi9MGw=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
index ee9ea1cb21..86413c8e46 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -1,29 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
-		<Model>Sample Bus Model</Model>
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
-		<LegislativeClass>M3</LegislativeClass>
-		<ClassBus>II</ClassBus>
-		<VehicleCode>CE</VehicleCode>
-		<CurbMassChassis>10680</CurbMassChassis>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<RegisteredPassengers>
-			<LowerDeck>86</LowerDeck>
-			<UpperDeck>0</UpperDeck>
-		</RegisteredPassengers>
+		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<ClassBus>II</ClassBus>
+			<NumberPassengersLowerDeck>86</NumberPassengersLowerDeck>
+			<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+		<BodyworkCode>CE</BodyworkCode>
 		<LowEntry>true</LowEntry>
-		<HeightIntegratedBody>3.000</HeightIntegratedBody>
-		<VehicleLength>10.633</VehicleLength>
-		<VehicleWidth>2.550</VehicleWidth>
-		<EntranceHeight>0.270</EntranceHeight>
+		<HeightIntegratedBody>3000</HeightIntegratedBody>
+		<VehicleLength>10633</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>270</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
-			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+			<AirDrag>
+				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -33,7 +41,7 @@
 					<TransferredCdxA>4.90</TransferredCdxA>
 					<DeclaredCdxA>4.90</DeclaredCdxA>
 				</Data>
-				<Signature>
+				<v2.0:Signature>
 					<di:Reference URI="#CabinX23h">
 						<di:Transforms>
 							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -42,29 +50,27 @@
 						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 					</di:Reference>
-				</Signature>
-			</v2.6:AirDrag>
+				</v2.0:Signature>
+			</AirDrag>
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
 						<LEDLights>
+							<Interiorlights>true</Interiorlights>
 							<Dayrunninglights>true</Dayrunninglights>
-							<Headlights>true</Headlights>
 							<Positionlights>true</Positionlights>
 							<Brakelights>true</Brakelights>
-							<Interiorlights>true</Interiorlights>
+							<Headlights>true</Headlights>
 						</LEDLights>
 					</ElectricSystem>
 					<HVAC>
 						<SystemConfiguration>6</SystemConfiguration>
-						<CompressorType>
-							<DriverAC>none</DriverAC>
-							<PassengerAC>2-stage</PassengerAC>
-						</CompressorType>
+						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>N.A.</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
 						<AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
 						<DoubleGlazing>true</DoubleGlazing>
-						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
 					</HVAC>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
index 26c9123d9a..0254cb35dd 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml	
@@ -1,603 +1,605 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-7f30aafa027a41a1864b">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_SmartPS</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>6x2</AxleConfiguration>
-      <Articulated>false</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>600</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>false</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-        <tcl:Entry gear="12" maxTorque="1900" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>Bus 6x2</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>12730</Displacement>
-            <RatedSpeed>1800</RatedSpeed>
-            <RatedPower>325032</RatedPower>
-            <MaxEngineTorque>2134</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>600</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
-                <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-                <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-                <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-                <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-                <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-                <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-                <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-                <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-                <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck Gearbox</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>AMT</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>14.930</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>11.640</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>9.020</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>7.040</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>5.640</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>4.400</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="7">
-                <Ratio>3.390</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="8">
-                <Ratio>2.650</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="9">
-                <Ratio>2.050</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="10">
-                <Ratio>1.600</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="11">
-                <Ratio>1.280</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="12">
-                <Ratio>1.000</Ratio>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck AxleGear</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>2.590</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>false</aux:SmartElectrics>
-              <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
-              <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>true</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_SmartPS">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-7a8d7d4a9dbf4eb895f1">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>+PTOULR+qwZkYaGik0otzNDA8i3Gy4tvXQeORxqNXG0=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1555.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1862.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1227.15</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1483.80</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1051.58</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1290.13</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
-          <Payload unit="kg">1294.51</Payload>
-          <PassengerCount>18.23</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">866.66</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
-          <Payload unit="kg">4236.57</Payload>
-          <PassengerCount>59.67</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">970.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1665.49</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2049.48</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1312.66</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1630.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1120.08</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1411.95</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
-          <Payload unit="kg">1254.68</Payload>
-          <PassengerCount>17.67</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">875.01</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
-          <Payload unit="kg">4106.21</Payload>
-          <PassengerCount>57.83</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">976.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
-          <Payload unit="kg">1277.49</Payload>
-          <PassengerCount>17.99</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">639.08</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
-          <Payload unit="kg">3193.72</Payload>
-          <PassengerCount>44.98</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">674.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
-          <Payload unit="kg">1738.08</Payload>
-          <PassengerCount>24.48</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">995.69</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
-          <Payload unit="kg">5793.60</Payload>
-          <PassengerCount>81.60</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1141.12</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
-          <Payload unit="kg">1853.95</Payload>
-          <PassengerCount>26.11</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">720.51</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
-          <Payload unit="kg">4634.88</Payload>
-          <PassengerCount>65.28</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">774.60</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.2.2058-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-08-20T12:17:31.4151388Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-7f30aafa027a41a1864b">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-      </di:Transforms>
-      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-      <di:DigestValue>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-7f30aafa027a41a1864b">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_SmartPS</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>6x2</AxleConfiguration>
+				<Articulated>false</Articulated>
+				<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+				<IdlingSpeed>600</IdlingSpeed>
+				<RetarderType>Transmission Output Retarder</RetarderType>
+				<RetarderRatio>1.000</RetarderRatio>
+				<AngledriveType>None</AngledriveType>
+				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+				<ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+					<adas:EngineStopStart>false</adas:EngineStopStart>
+					<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+					<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+					<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+				</ADAS>
+				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+					<tcl:Entry gear="6" maxTorque="1800"/>
+					<tcl:Entry gear="1" maxTorque="2500"/>
+					<tcl:Entry gear="12" maxTorque="1900"/>
+				</TorqueLimits>
+				<Components xsi:type="VehicleComponentsPIFType">
+					<Engine>
+						<Data xsi:type="EngineDataPIFType">
+							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+							<Model>Bus 6x2</Model>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>VectoEngine x.y</AppVersion>
+							<Displacement>12730</Displacement>
+							<RatedSpeed>1800</RatedSpeed>
+							<RatedPower>325032</RatedPower>
+							<MaxEngineTorque>2134</MaxEngineTorque>
+							<WHRType>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+							</WHRType>
+							<Mode>
+								<IdlingSpeed>600</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic 40t Long Haul Truck Gearbox</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>AMT</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>14.930</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>11.640</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>9.020</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>7.040</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>5.640</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>4.400</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="7">
+									<Ratio>3.390</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="8">
+									<Ratio>2.650</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="9">
+									<Ratio>2.050</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="10">
+									<Ratio>1.600</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="11">
+									<Ratio>1.280</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="12">
+									<Ratio>1.000</Ratio>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic 40t Long Haul Truck AxleGear</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>2.590</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>false</TwinTyres>
+									<Steered>true</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0055</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleDriven</AxleType>
+									<TwinTyres>true</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0063</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>false</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0055</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>true</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-7a8d7d4a9dbf4eb895f1">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>+PTOULR+qwZkYaGik0otzNDA8i3Gy4tvXQeORxqNXG0=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1555.73</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1862.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1227.15</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1483.80</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1051.58</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1290.13</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
+						<Payload unit="kg">1294.51</Payload>
+						<PassengerCount>18.23</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">866.66</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
+						<Payload unit="kg">4236.57</Payload>
+						<PassengerCount>59.67</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">970.73</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1665.49</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2049.48</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1312.66</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1630.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1120.08</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1411.95</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
+						<Payload unit="kg">1254.68</Payload>
+						<PassengerCount>17.67</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">875.01</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+						<Payload unit="kg">4106.21</Payload>
+						<PassengerCount>57.83</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">976.63</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
+						<Payload unit="kg">1277.49</Payload>
+						<PassengerCount>17.99</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">639.08</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
+						<Payload unit="kg">3193.72</Payload>
+						<PassengerCount>44.98</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">674.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
+						<Payload unit="kg">1738.08</Payload>
+						<PassengerCount>24.48</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">995.69</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+						<Payload unit="kg">5793.60</Payload>
+						<PassengerCount>81.60</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1141.12</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
+						<Payload unit="kg">1853.95</Payload>
+						<PassengerCount>26.11</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">720.51</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
+						<Payload unit="kg">4634.88</Payload>
+						<PassengerCount>65.28</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">774.60</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.2.2058-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-08-20T12:17:31.4151388Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-7f30aafa027a41a1864b">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
index 263d916f17..cb2b6bd5d7 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
-		<Model>Sample Bus Model</Model>
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
-		<LegislativeClass>M3</LegislativeClass>
-		<ClassBus>II+III</ClassBus>
-		<VehicleCode>CB</VehicleCode>
-		<CurbMassChassis>19400</CurbMassChassis>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<RegisteredPassengers>
-			<LowerDeck>16</LowerDeck>
-			<UpperDeck>56</UpperDeck>
-		</RegisteredPassengers>
+		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<ClassBus>II+III</ClassBus>
+		<NumberPassengersLowerDeck>16</NumberPassengersLowerDeck>
+		<NumberPassengersUpperDeck>56</NumberPassengersUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
 		<LowEntry>true</LowEntry>
-		<HeightIntegratedBody>4.000</HeightIntegratedBody>
-		<VehicleLength>13.890</VehicleLength>
-		<VehicleWidth>2.550</VehicleWidth>
-		<EntranceHeight>0.300</EntranceHeight>
+		<HeightIntegratedBody>4000</HeightIntegratedBody>
+		<VehicleLength>13890</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>300</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
-			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
@@ -43,28 +44,26 @@
 						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 					</di:Reference>
 				</Signature>
-			</v2.6:AirDrag>
+			</v2.8:AirDrag>
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
 						<LEDLights>
+							<Interiorlights>true</Interiorlights>
 							<Dayrunninglights>true</Dayrunninglights>
-							<Headlights>true</Headlights>
 							<Positionlights>true</Positionlights>
 							<Brakelights>true</Brakelights>
-							<Interiorlights>true</Interiorlights>
+							<Headlights>true</Headlights>
 						</LEDLights>
 					</ElectricSystem>
 					<HVAC>
 						<SystemConfiguration>6</SystemConfiguration>
-						<CompressorType>
-							<DriverAC>none</DriverAC>
-							<PassengerAC>2-stage</PassengerAC>
-						</CompressorType>
+						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>N.A.</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
 						<AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
 						<DoubleGlazing>true</DoubleGlazing>
-						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
 					</HVAC>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml
index ee0f566dfd..1cc8901201 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml	
@@ -1,519 +1,522 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
-  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-10652bf49ae0499f8689">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model</Model>
-      <VIN>VEH-1234567890_nonSmart-ESS</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>8x2</AxleConfiguration>
-      <Articulated>true</Articulated>
-      <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
-      <IdlingSpeed>600</IdlingSpeed>
-      <RetarderType>Transmission Output Retarder</RetarderType>
-      <RetarderRatio>1.000</RetarderRatio>
-      <AngledriveType>None</AngledriveType>
-      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-        <adas:EngineStopStart>true</adas:EngineStopStart>
-        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-      </ADAS>
-      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
-        <tcl:Entry gear="6" maxTorque="1800" />
-        <tcl:Entry gear="1" maxTorque="2500" />
-        <tcl:Entry gear="12" maxTorque="1900" />
-      </TorqueLimits>
-      <Components xsi:type="VehicleComponentsPIFType">
-        <Engine>
-          <Data xsi:type="EngineDataPIFType">
-            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
-            <Model>8x2 articulated bus Engine</Model>
-            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-            <Date>2017-02-15T11:00:00Z</Date>
-            <AppVersion>VectoEngine x.y</AppVersion>
-            <Displacement>12730</Displacement>
-            <RatedSpeed>2200</RatedSpeed>
-            <RatedPower>260</RatedPower>
-            <MaxEngineTorque>2400</MaxEngineTorque>
-            <WHRType>
-              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
-            </WHRType>
-            <Mode>
-              <IdlingSpeed>600</IdlingSpeed>
-              <FullLoadAndDragCurve>
-                <Entry engineSpeed="600.00" maxTorque="710.00" dragTorque="-52.00" />
-                <Entry engineSpeed="800.00" maxTorque="989.00" dragTorque="-63.00" />
-                <Entry engineSpeed="1000.00" maxTorque="1265.00" dragTorque="-73.00" />
-                <Entry engineSpeed="1200.00" maxTorque="1420.00" dragTorque="-87.00" />
-                <Entry engineSpeed="1400.00" maxTorque="1420.00" dragTorque="-101.00" />
-                <Entry engineSpeed="1600.00" maxTorque="1420.00" dragTorque="-114.00" />
-                <Entry engineSpeed="1800.00" maxTorque="1329.00" dragTorque="-122.00" />
-                <Entry engineSpeed="2000.00" maxTorque="1227.00" dragTorque="-131.00" />
-                <Entry engineSpeed="2200.00" maxTorque="1129.00" dragTorque="-147.00" />
-                <Entry engineSpeed="2400.00" maxTorque="965.00" dragTorque="-159.00" />
-                <Entry engineSpeed="2500.00" maxTorque="841.00" dragTorque="-165.00" />
-                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-172.00" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>8x2 Bus</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>APT-P</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>1.361</Ratio>
-                <MaxTorque>1900</MaxTorque>
-              </Gear>
-              <Gear number="2">
-                <Ratio>1.000</Ratio>
-                <MaxTorque>1900</MaxTorque>
-              </Gear>
-              <Gear number="3">
-                <Ratio>0.735</Ratio>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>8x2 articulated bus</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>5.810</Ratio>
-          </Data>
-        </Axlegear>
-        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-          <Data xsi:type="AxleWheelsDataDeclarationType">
-            <Axles>
-              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>true</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleDriven</AxleType>
-                <TwinTyres>true</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0063</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-              <Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
-                <AxleType>VehicleNonDriven</AxleType>
-                <TwinTyres>false</TwinTyres>
-                <Steered>false</Steered>
-                <Tyre>
-                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
-                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
-                    <Model>Generic Wheel</Model>
-                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
-                    <Date>2017-01-11T14:00:00Z</Date>
-                    <AppVersion>Tyre Generation App 1.0</AppVersion>
-                    <Dimension>315/70 R22.5</Dimension>
-                    <RRCDeclared>0.0055</RRCDeclared>
-                    <FzISO>31300</FzISO>
-                  </Data>
-                  <Signature>
-                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-                      <di:Transforms>
-                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                      </di:Transforms>
-                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
-                    </di:Reference>
-                  </Signature>
-                </Tyre>
-              </Axle>
-            </Axles>
-          </Data>
-        </pbus:AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
-            <aux:Fan>
-              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
-            </aux:Fan>
-            <aux:SteeringPump>
-              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
-            </aux:SteeringPump>
-            <aux:ElectricSystem>
-              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
-              <aux:SmartElectrics>false</aux:SmartElectrics>
-            </aux:ElectricSystem>
-            <aux:PneumaticSystem>
-              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
-              <aux:Clutch>none</aux:Clutch>
-              <aux:CompressorRatio>1.000</aux:CompressorRatio>
-              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
-              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
-              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
-              <aux:AdBlueDosing>true</aux:AdBlueDosing>
-            </aux:PneumaticSystem>
-            <aux:HVAC>
-              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
-              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
-            </aux:HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_nonSmart-ESS">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>jvHzwuW7gaqCxNBELjVg0ZwSEWPR+pSn2iUsocSa2/4=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-65d622ab1d834d94ac65">
-        <di:Transforms>
-          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-        </di:Transforms>
-        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-        <di:DigestValue>k2hbOlnDmFKemd1pQt7YrzNLf5RAKIdH7wMobex4+hw=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>error</Status>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
-          <Payload unit="kg">2059.99</Payload>
-          <PassengerCount>30.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">31.43467</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2304.23</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
-          <Payload unit="kg">10299.96</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">40.44322</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2964.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
-          <Payload unit="kg">2059.99</Payload>
-          <PassengerCount>30.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.29407</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1854.11</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
-          <Payload unit="kg">10299.96</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">32.82324</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2406.01</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
-          <Payload unit="kg">2059.99</Payload>
-          <PassengerCount>30.29</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.42260</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1570.32</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
-          <Payload unit="kg">10299.96</Payload>
-          <PassengerCount>151.47</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">26.89680</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1971.59</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
-          <Payload unit="kg">2540.66</Payload>
-          <PassengerCount>37.36</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">38.59941</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2829.42</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
-          <Payload unit="kg">12703.28</Payload>
-          <PassengerCount>186.81</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">50.04116</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">3668.12</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
-          <Payload unit="kg">2540.66</Payload>
-          <PassengerCount>37.36</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">31.08581</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2278.66</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
-          <Payload unit="kg">12703.28</Payload>
-          <PassengerCount>186.81</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">41.40670</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">3035.20</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
-          <Payload unit="kg">2540.66</Payload>
-          <PassengerCount>37.36</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.67399</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1881.96</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P39DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
-          <Payload unit="kg">12703.28</Payload>
-          <PassengerCount>186.81</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">32.19445</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2359.92</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22563.16</TotalVehicleMass>
-          <Payload unit="kg">1613.16</Payload>
-          <PassengerCount>22.72</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">18.51694</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1357.33</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27402.62</TotalVehicleMass>
-          <Payload unit="kg">6452.62</Payload>
-          <PassengerCount>90.88</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">38.15886</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2797.12</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22957.48</TotalVehicleMass>
-          <Payload unit="kg">2007.48</Payload>
-          <PassengerCount>28.27</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.84130</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1014.60</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">25968.71</TotalVehicleMass>
-          <Payload unit="kg">5018.71</Payload>
-          <PassengerCount>70.69</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.06873</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1104.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">26840.49</TotalVehicleMass>
-          <Payload unit="kg">2240.49</Payload>
-          <PassengerCount>31.56</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.11304</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1620.93</CO2>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">33561.98</TotalVehicleMass>
-          <Payload unit="kg">8961.98</Payload>
-          <PassengerCount>126.23</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>98 (Interurban _P40DD_ReferenceLoad) - absTime: 6784.9522 [s], distance: 53835.3412 [m], dt: 0.6791 [s], v: 0.0259 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
-        <ErrorDetails>   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.Driver.DrivingActionAccelerate(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, IResponse previousResponse)
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-10652bf49ae0499f8689">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_nonSmart-ESS</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>8x2</AxleConfiguration>
+				<Articulated>true</Articulated>
+				<TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
+				<IdlingSpeed>600</IdlingSpeed>
+				<RetarderType>Transmission Output Retarder</RetarderType>
+				<RetarderRatio>1.000</RetarderRatio>
+				<AngledriveType>None</AngledriveType>
+				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+				<ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+					<adas:EngineStopStart>true</adas:EngineStopStart>
+					<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+					<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+					<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+				</ADAS>
+				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+					<tcl:Entry gear="6" maxTorque="1800"/>
+					<tcl:Entry gear="1" maxTorque="2500"/>
+					<tcl:Entry gear="12" maxTorque="1900"/>
+				</TorqueLimits>
+				<Components xsi:type="VehicleComponentsPIFType">
+					<Engine>
+						<Data xsi:type="EngineDataPIFType">
+							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+							<Model>8x2 articulated bus Engine</Model>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>VectoEngine x.y</AppVersion>
+							<Displacement>12730</Displacement>
+							<RatedSpeed>2200</RatedSpeed>
+							<RatedPower>260</RatedPower>
+							<MaxEngineTorque>2400</MaxEngineTorque>
+							<WHRType>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+							</WHRType>
+							<Mode>
+								<IdlingSpeed>600</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="600.00" maxTorque="710.00" dragTorque="-52.00"/>
+									<Entry engineSpeed="800.00" maxTorque="989.00" dragTorque="-63.00"/>
+									<Entry engineSpeed="1000.00" maxTorque="1265.00" dragTorque="-73.00"/>
+									<Entry engineSpeed="1200.00" maxTorque="1420.00" dragTorque="-87.00"/>
+									<Entry engineSpeed="1400.00" maxTorque="1420.00" dragTorque="-101.00"/>
+									<Entry engineSpeed="1600.00" maxTorque="1420.00" dragTorque="-114.00"/>
+									<Entry engineSpeed="1800.00" maxTorque="1329.00" dragTorque="-122.00"/>
+									<Entry engineSpeed="2000.00" maxTorque="1227.00" dragTorque="-131.00"/>
+									<Entry engineSpeed="2200.00" maxTorque="1129.00" dragTorque="-147.00"/>
+									<Entry engineSpeed="2400.00" maxTorque="965.00" dragTorque="-159.00"/>
+									<Entry engineSpeed="2500.00" maxTorque="841.00" dragTorque="-165.00"/>
+									<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-172.00"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>8x2 Bus</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>APT-P</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>1.361</Ratio>
+									<MaxTorque>1900</MaxTorque>
+								</Gear>
+								<Gear number="2">
+									<Ratio>1.000</Ratio>
+									<MaxTorque>1900</MaxTorque>
+								</Gear>
+								<Gear number="3">
+									<Ratio>0.735</Ratio>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>8x2 articulated bus</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>5.810</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<vif0.1:Axles xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>false</TwinTyres>
+									<Steered>true</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0055</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>true</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0063</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
+									<AxleType>VehicleDriven</AxleType>
+									<TwinTyres>true</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0063</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
+									<AxleType>VehicleNonDriven</AxleType>
+									<TwinTyres>false</TwinTyres>
+									<Steered>false</Steered>
+									<Tyre>
+										<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+											<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+											<Model>Generic Wheel</Model>
+											<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+											<Date>2017-01-11T14:00:00Z</Date>
+											<AppVersion>Tyre Generation App 1.0</AppVersion>
+											<Dimension>315/70 R22.5</Dimension>
+											<RRCDeclared>0.0055</RRCDeclared>
+											<FzISO>31300</FzISO>
+										</Data>
+										<Signature>
+											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+												<di:Transforms>
+													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+												</di:Transforms>
+												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+											</di:Reference>
+										</Signature>
+									</Tyre>
+								</vif0.1:Axle>
+							</vif0.1:Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>false</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_nonSmart-ESS">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>jvHzwuW7gaqCxNBELjVg0ZwSEWPR+pSn2iUsocSa2/4=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-65d622ab1d834d94ac65">
+					<di:Transforms>
+						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+					</di:Transforms>
+					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+					<di:DigestValue>k2hbOlnDmFKemd1pQt7YrzNLf5RAKIdH7wMobex4+hw=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>error</Status>
+				<Result status="success">
+					<VehicleGroup>P39SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+						<Payload unit="kg">2059.99</Payload>
+						<PassengerCount>30.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">31.43467</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2304.23</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+						<Payload unit="kg">10299.96</Payload>
+						<PassengerCount>151.47</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">40.44322</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2964.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+						<Payload unit="kg">2059.99</Payload>
+						<PassengerCount>30.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">25.29407</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1854.11</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+						<Payload unit="kg">10299.96</Payload>
+						<PassengerCount>151.47</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">32.82324</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2406.01</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+						<Payload unit="kg">2059.99</Payload>
+						<PassengerCount>30.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.42260</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1570.32</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+						<Payload unit="kg">10299.96</Payload>
+						<PassengerCount>151.47</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">26.89680</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1971.59</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+						<Payload unit="kg">2540.66</Payload>
+						<PassengerCount>37.36</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">38.59941</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2829.42</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+						<Payload unit="kg">12703.28</Payload>
+						<PassengerCount>186.81</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">50.04116</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">3668.12</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+						<Payload unit="kg">2540.66</Payload>
+						<PassengerCount>37.36</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">31.08581</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2278.66</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+						<Payload unit="kg">12703.28</Payload>
+						<PassengerCount>186.81</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">41.40670</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">3035.20</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+						<Payload unit="kg">2540.66</Payload>
+						<PassengerCount>37.36</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">25.67399</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1881.96</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P39DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+						<Payload unit="kg">12703.28</Payload>
+						<PassengerCount>186.81</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">32.19445</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2359.92</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P40SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22563.16</TotalVehicleMass>
+						<Payload unit="kg">1613.16</Payload>
+						<PassengerCount>22.72</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">18.51694</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1357.33</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P40SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">27402.62</TotalVehicleMass>
+						<Payload unit="kg">6452.62</Payload>
+						<PassengerCount>90.88</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">38.15886</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2797.12</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P40SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22957.48</TotalVehicleMass>
+						<Payload unit="kg">2007.48</Payload>
+						<PassengerCount>28.27</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.84130</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1014.60</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P40SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">25968.71</TotalVehicleMass>
+						<Payload unit="kg">5018.71</Payload>
+						<PassengerCount>70.69</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.06873</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1104.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P40DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">26840.49</TotalVehicleMass>
+						<Payload unit="kg">2240.49</Payload>
+						<PassengerCount>31.56</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.11304</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1620.93</CO2>
+				</Result>
+				<Result status="error">
+					<VehicleGroup>P40DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">33561.98</TotalVehicleMass>
+						<Payload unit="kg">8961.98</Payload>
+						<PassengerCount>126.23</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Error>98 (Interurban _P40DD_ReferenceLoad) - absTime: 6784.9522 [s], distance: 53835.3412 [m], dt: 0.6791 [s], v: 0.0259 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
+					<ErrorDetails>   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.Driver.DrivingActionAccelerate(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, IResponse previousResponse)
    bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.FirstAccelerateOrCoast(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed, MeterPerSecond velocityWithOverspeed, DebugData debug)
    bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.HandleRequestEngaged(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed, MeterPerSecond velocityWithOverspeed, DebugData debug)
    bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.DoHandleRequest(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed)
@@ -525,51 +528,52 @@
    bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DistanceBasedDrivingCycle.Request(Second absTime, Meter ds)
    bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
    bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">27467.83</TotalVehicleMass>
-          <Payload unit="kg">2867.83</Payload>
-          <PassengerCount>40.39</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>99 (Coach _P40DD_LowLoading) - absTime: 7924.2025 [s], distance: 131329.1916 [m], dt: 0.6490 [s], v: 0.0076 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 228.7985 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0036 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0306 [m/s^2], OperatingPoint: a: -0.0306 [m/s^2], dt: 0.0036 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0075 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 292.2862 [W], AxlegearPowerRequest: 283.3102 [W], WheelsPowerRequest: 283.3102 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3252.6557 [Nm], GearboxInputSpeed: 0.0889 [1/s], TorqueConverterOperatingPoint: n_out: 0.0902 [1/s], n_in: 63.4602 [1/s], tq_out: 726.9261 [Nm], tq_in 297.1152 [Nm], nu: 0.00142183442517666, my: 2.44661391211967, TorqueConverterTorqueDemand: }</Error>
-        <ErrorDetails>   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.&lt;&gt;c.&lt;DoSimulationStep&gt;b__1_3(IResponse r)
+				</Result>
+				<Result status="error">
+					<VehicleGroup>P40DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">27467.83</TotalVehicleMass>
+						<Payload unit="kg">2867.83</Payload>
+						<PassengerCount>40.39</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Error>99 (Coach _P40DD_LowLoading) - absTime: 7924.2025 [s], distance: 131329.1916 [m], dt: 0.6490 [s], v: 0.0076 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 228.7985 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0036 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0306 [m/s^2], OperatingPoint: a: -0.0306 [m/s^2], dt: 0.0036 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0075 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 292.2862 [W], AxlegearPowerRequest: 283.3102 [W], WheelsPowerRequest: 283.3102 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3252.6557 [Nm], GearboxInputSpeed: 0.0889 [1/s], TorqueConverterOperatingPoint: n_out: 0.0902 [1/s], n_in: 63.4602 [1/s], tq_out: 726.9261 [Nm], tq_in 297.1152 [Nm], nu: 0.00142183442517666, my: 2.44661391211967, TorqueConverterTorqueDemand: }</Error>
+					<ErrorDetails>   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.&lt;&gt;c.&lt;DoSimulationStep&gt;b__1_3(IResponse r)
    bei TUGraz.VectoCore.Utils.Switch`1.Default(Action`1 action)
    bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
    bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
-      </Result>
-      <Result status="error">
-        <VehicleGroup>P40DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">31769.58</TotalVehicleMass>
-          <Payload unit="kg">7169.58</Payload>
-          <PassengerCount>100.98</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Error>100 (Coach _P40DD_ReferenceLoad) - absTime: 7524.6514 [s], distance: 130336.7109 [m], dt: 0.7342 [s], v: 0.0092 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 270.7480 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0049 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0467 [m/s^2], OperatingPoint: a: -0.0467 [m/s^2], dt: 0.0049 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0090 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 345.1743 [W], AxlegearPowerRequest: 334.5284 [W], WheelsPowerRequest: 334.5284 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3212.7746 [Nm], GearboxInputSpeed: 0.1057 [1/s], TorqueConverterOperatingPoint: n_out: 0.1085 [1/s], n_in: 63.4602 [1/s], tq_out: 726.6280 [Nm], tq_in 297.0764 [Nm], nu: 0.00170920399100873, my: 2.44592954368211, TorqueConverterTorqueDemand: }</Error>
-        <ErrorDetails>   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.&lt;&gt;c.&lt;DoSimulationStep&gt;b__1_3(IResponse r)
+				</Result>
+				<Result status="error">
+					<VehicleGroup>P40DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">31769.58</TotalVehicleMass>
+						<Payload unit="kg">7169.58</Payload>
+						<PassengerCount>100.98</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Error>100 (Coach _P40DD_ReferenceLoad) - absTime: 7524.6514 [s], distance: 130336.7109 [m], dt: 0.7342 [s], v: 0.0092 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 270.7480 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0049 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0467 [m/s^2], OperatingPoint: a: -0.0467 [m/s^2], dt: 0.0049 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0090 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 345.1743 [W], AxlegearPowerRequest: 334.5284 [W], WheelsPowerRequest: 334.5284 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3212.7746 [Nm], GearboxInputSpeed: 0.1057 [1/s], TorqueConverterOperatingPoint: n_out: 0.1085 [1/s], n_in: 63.4602 [1/s], tq_out: 726.6280 [Nm], tq_in 297.0764 [Nm], nu: 0.00170920399100873, my: 2.44592954368211, TorqueConverterTorqueDemand: }</Error>
+					<ErrorDetails>   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.&lt;&gt;c.&lt;DoSimulationStep&gt;b__1_3(IResponse r)
    bei TUGraz.VectoCore.Utils.Switch`1.Default(Action`1 action)
    bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
    bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1974-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-05-28T14:48:47.62548Z</Date>
-    </ApplicationInformation>
-  </pif:Data>
-  <pif:Signature>
-    <di:Reference URI="#PIF-10652bf49ae0499f8689">
-      <di:Transforms>
-        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-      </di:Transforms>
-      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-      <di:DigestValue>kNMmLf/SQo7//Wr3wmU1/x7c3q7VbmBEILJi39cdrz4=</di:DigestValue>
-    </di:Reference>
-  </pif:Signature>
-</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1974-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-05-28T14:48:47.62548Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-10652bf49ae0499f8689">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>kNMmLf/SQo7//Wr3wmU1/x7c3q7VbmBEILJi39cdrz4=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
index ec94637358..6920f5f350 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
-		<Model>Sample Bus Model</Model>
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
-		<LegislativeClass>M3</LegislativeClass>
-		<ClassBus>II</ClassBus>
-		<VehicleCode>CG</VehicleCode>
-		<CurbMassChassis>19000</CurbMassChassis>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>19000</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>37000</TechnicalPermissibleMaximumLadenMass>
-		<RegisteredPassengers>
-			<LowerDeck>181</LowerDeck>
-			<UpperDeck>0</UpperDeck>
-		</RegisteredPassengers>
+		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<ClassBus>II</ClassBus>
+		<NumberPassengersLowerDeck>181</NumberPassengersLowerDeck>
+		<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+		<BodyworkCode>CG</BodyworkCode>
 		<LowEntry>false</LowEntry>
-		<HeightIntegratedBody>3.000</HeightIntegratedBody>
-		<VehicleLength>19.700</VehicleLength>
-		<VehicleWidth>2.550</VehicleWidth>
-		<EntranceHeight>0.320</EntranceHeight>
+		<HeightIntegratedBody>3000</HeightIntegratedBody>
+		<VehicleLength>19700</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>0320</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
-			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+			<AirDrag>
+				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -33,7 +34,7 @@
 					<TransferredCdxA>5.20</TransferredCdxA>
 					<DeclaredCdxA>5.20</DeclaredCdxA>
 				</Data>
-				<Signature>
+				<v2.0:Signature>
 					<di:Reference URI="#CabinX23h">
 						<di:Transforms>
 							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -42,29 +43,27 @@
 						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 					</di:Reference>
-				</Signature>
-			</v2.6:AirDrag>
+				</v2.0:Signature>
+			</AirDrag>
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
 						<LEDLights>
+							<Interiorlights>true</Interiorlights>
 							<Dayrunninglights>true</Dayrunninglights>
-							<Headlights>true</Headlights>
 							<Positionlights>true</Positionlights>
 							<Brakelights>true</Brakelights>
-							<Interiorlights>true</Interiorlights>
+							<Headlights>true</Headlights>
 						</LEDLights>
 					</ElectricSystem>
 					<HVAC>
 						<SystemConfiguration>7</SystemConfiguration>
-						<CompressorType>
-							<DriverAC>2-stage</DriverAC>
-							<PassengerAC>3-stage</PassengerAC>
-						</CompressorType>
+						<HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 3-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
 						<AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
 						<DoubleGlazing>true</DoubleGlazing>
-						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
 					</HVAC>
diff --git a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
index 4e56fa439d..b3493936e3 100644
--- a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
@@ -2188,19 +2188,27 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>true</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>smart</AlternatorTechnology>
+						<SmartAlternator>
+							<RatedCurrent>310</RatedCurrent>
+							<RatedVoltage>48</RatedVoltage>
+						</SmartAlternator>
+						<Battery>
+							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+							<RatedCapacity>1</RatedCapacity>
+							<NominalVoltage>48</NominalVoltage>
+						</Battery>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
index 4d065f7c2d..7ca77eecbb 100644
--- a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartPS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>6x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -47,138 +47,138 @@
 					<CFNCV>1.0000</CFNCV>
 					<FuelType>Diesel CI</FuelType>
 					<FuelConsumptionMap>
-							<Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00" />
-							<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00" />
-							<Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75" />
-							<Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91" />
-							<Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95" />
-							<Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27" />
-							<Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00" />
-							<Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45" />
-							<Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57" />
-							<Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68" />
-							<Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80" />
-							<Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92" />
-							<Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00" />
-							<Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69" />
-							<Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77" />
-							<Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06" />
-							<Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92" />
-							<Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55" />
-							<Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09" />
-							<Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44" />
-							<Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90" />
-							<Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02" />
-							<Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05" />
-							<Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96" />
-							<Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00" />
-							<Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15" />
-							<Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49" />
-							<Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43" />
-							<Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87" />
-							<Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49" />
-							<Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62" />
-							<Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10" />
-							<Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31" />
-							<Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18" />
-							<Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40" />
-							<Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09" />
-							<Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00" />
-							<Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21" />
-							<Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69" />
-							<Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67" />
-							<Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76" />
-							<Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71" />
-							<Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70" />
-							<Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40" />
-							<Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65" />
-							<Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67" />
-							<Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29" />
-							<Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72" />
-							<Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00" />
-							<Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21" />
-							<Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55" />
-							<Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50" />
-							<Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59" />
-							<Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22" />
-							<Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81" />
-							<Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77" />
-							<Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22" />
-							<Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60" />
-							<Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89" />
-							<Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10" />
-							<Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00" />
-							<Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15" />
-							<Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52" />
-							<Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44" />
-							<Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41" />
-							<Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61" />
-							<Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71" />
-							<Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01" />
-							<Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96" />
-							<Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37" />
-							<Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97" />
-							<Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23" />
-							<Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00" />
-							<Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84" />
-							<Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80" />
-							<Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69" />
-							<Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18" />
-							<Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30" />
-							<Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33" />
-							<Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82" />
-							<Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91" />
-							<Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82" />
-							<Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52" />
-							<Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14" />
-							<Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00" />
-							<Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40" />
-							<Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91" />
-							<Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19" />
-							<Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18" />
-							<Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21" />
-							<Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36" />
-							<Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25" />
-							<Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48" />
-							<Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01" />
-							<Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92" />
-							<Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75" />
-							<Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00" />
-							<Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80" />
-							<Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09" />
-							<Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05" />
-							<Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56" />
-							<Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62" />
-							<Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51" />
-							<Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51" />
-							<Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25" />
-							<Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29" />
-							<Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45" />
-							<Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09" />
-							<Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00" />
-							<Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51" />
-							<Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55" />
-							<Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96" />
-							<Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46" />
-							<Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94" />
-							<Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10" />
-							<Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71" />
-							<Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15" />
-							<Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35" />
-							<Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10" />
-							<Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30" />
+						<Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00"/>
+						<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00"/>
+						<Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75"/>
+						<Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91"/>
+						<Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95"/>
+						<Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27"/>
+						<Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00"/>
+						<Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45"/>
+						<Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57"/>
+						<Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68"/>
+						<Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80"/>
+						<Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92"/>
+						<Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00"/>
+						<Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69"/>
+						<Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77"/>
+						<Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06"/>
+						<Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92"/>
+						<Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55"/>
+						<Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09"/>
+						<Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44"/>
+						<Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90"/>
+						<Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02"/>
+						<Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05"/>
+						<Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96"/>
+						<Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00"/>
+						<Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15"/>
+						<Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49"/>
+						<Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43"/>
+						<Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87"/>
+						<Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49"/>
+						<Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62"/>
+						<Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10"/>
+						<Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31"/>
+						<Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18"/>
+						<Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40"/>
+						<Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09"/>
+						<Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21"/>
+						<Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69"/>
+						<Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67"/>
+						<Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76"/>
+						<Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71"/>
+						<Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70"/>
+						<Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40"/>
+						<Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65"/>
+						<Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67"/>
+						<Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29"/>
+						<Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72"/>
+						<Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21"/>
+						<Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55"/>
+						<Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50"/>
+						<Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59"/>
+						<Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22"/>
+						<Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81"/>
+						<Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77"/>
+						<Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22"/>
+						<Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60"/>
+						<Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89"/>
+						<Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10"/>
+						<Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15"/>
+						<Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52"/>
+						<Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44"/>
+						<Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41"/>
+						<Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61"/>
+						<Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71"/>
+						<Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01"/>
+						<Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96"/>
+						<Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37"/>
+						<Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97"/>
+						<Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23"/>
+						<Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84"/>
+						<Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80"/>
+						<Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69"/>
+						<Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18"/>
+						<Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30"/>
+						<Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33"/>
+						<Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82"/>
+						<Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91"/>
+						<Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82"/>
+						<Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52"/>
+						<Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14"/>
+						<Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40"/>
+						<Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91"/>
+						<Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19"/>
+						<Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18"/>
+						<Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21"/>
+						<Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36"/>
+						<Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25"/>
+						<Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48"/>
+						<Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01"/>
+						<Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92"/>
+						<Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75"/>
+						<Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80"/>
+						<Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09"/>
+						<Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05"/>
+						<Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56"/>
+						<Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62"/>
+						<Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51"/>
+						<Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51"/>
+						<Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25"/>
+						<Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29"/>
+						<Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45"/>
+						<Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09"/>
+						<Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51"/>
+						<Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55"/>
+						<Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96"/>
+						<Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46"/>
+						<Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94"/>
+						<Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10"/>
+						<Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71"/>
+						<Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15"/>
+						<Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35"/>
+						<Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10"/>
+						<Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30"/>
 					</FuelConsumptionMap>
 					<FullLoadAndDragCurve>
-							<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
-							<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-							<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-							<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-							<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-							<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-							<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-							<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-							<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-							<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+						<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+						<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+						<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+						<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+						<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+						<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+						<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+						<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+						<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+						<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
 					</FullLoadAndDragCurve>
 				</v2.0:Data>
 				<Signature>
@@ -2644,74 +2644,74 @@
 			</v2.6:Angledrive>
 			<v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
 				<Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
-						<Manufacturer>Generic Vendor</Manufacturer>
-						<Model>RET-generic</Model>
-						<CertificationNumber>standard values</CertificationNumber>
-						<Date>2018-02-02T13:38:22.424664Z</Date>
-						<AppVersion>VectoCore</AppVersion>
-						<CertificationMethod>Standard values</CertificationMethod>
-          <RetarderLossMap>
-            <Entry retarderSpeed="0.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="100.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="200.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="300.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="400.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="500.00" torqueLoss="5.10" />
-            <Entry retarderSpeed="600.00" torqueLoss="5.10" />
-            <Entry retarderSpeed="700.00" torqueLoss="5.10" />
-            <Entry retarderSpeed="800.00" torqueLoss="5.20" />
-            <Entry retarderSpeed="900.00" torqueLoss="5.20" />
-            <Entry retarderSpeed="1000.00" torqueLoss="5.30" />
-            <Entry retarderSpeed="1100.00" torqueLoss="5.30" />
-            <Entry retarderSpeed="1200.00" torqueLoss="5.40" />
-            <Entry retarderSpeed="1300.00" torqueLoss="5.40" />
-            <Entry retarderSpeed="1400.00" torqueLoss="5.50" />
-            <Entry retarderSpeed="1500.00" torqueLoss="5.60" />
-            <Entry retarderSpeed="1600.00" torqueLoss="5.60" />
-            <Entry retarderSpeed="1700.00" torqueLoss="5.70" />
-            <Entry retarderSpeed="1800.00" torqueLoss="5.80" />
-            <Entry retarderSpeed="1900.00" torqueLoss="5.90" />
-            <Entry retarderSpeed="2000.00" torqueLoss="6.00" />
-            <Entry retarderSpeed="2100.00" torqueLoss="6.10" />
-            <Entry retarderSpeed="2200.00" torqueLoss="6.20" />
-            <Entry retarderSpeed="2300.00" torqueLoss="6.30" />
-            <Entry retarderSpeed="2400.00" torqueLoss="6.40" />
-            <Entry retarderSpeed="2500.00" torqueLoss="6.60" />
-            <Entry retarderSpeed="2600.00" torqueLoss="6.70" />
-            <Entry retarderSpeed="2700.00" torqueLoss="6.80" />
-            <Entry retarderSpeed="2800.00" torqueLoss="7.00" />
-            <Entry retarderSpeed="2900.00" torqueLoss="7.10" />
-            <Entry retarderSpeed="3000.00" torqueLoss="7.30" />
-            <Entry retarderSpeed="3100.00" torqueLoss="7.40" />
-            <Entry retarderSpeed="3200.00" torqueLoss="7.60" />
-            <Entry retarderSpeed="3300.00" torqueLoss="7.70" />
-            <Entry retarderSpeed="3400.00" torqueLoss="7.90" />
-            <Entry retarderSpeed="3500.00" torqueLoss="8.10" />
-            <Entry retarderSpeed="3600.00" torqueLoss="8.20" />
-            <Entry retarderSpeed="3700.00" torqueLoss="8.40" />
-            <Entry retarderSpeed="3800.00" torqueLoss="8.60" />
-            <Entry retarderSpeed="3900.00" torqueLoss="8.80" />
-            <Entry retarderSpeed="4000.00" torqueLoss="9.00" />
-            <Entry retarderSpeed="4100.00" torqueLoss="9.20" />
-            <Entry retarderSpeed="4200.00" torqueLoss="9.40" />
-            <Entry retarderSpeed="4300.00" torqueLoss="9.60" />
-            <Entry retarderSpeed="4400.00" torqueLoss="9.80" />
-            <Entry retarderSpeed="4500.00" torqueLoss="10.10" />
-            <Entry retarderSpeed="4600.00" torqueLoss="10.30" />
-            <Entry retarderSpeed="4700.00" torqueLoss="10.50" />
-            <Entry retarderSpeed="4800.00" torqueLoss="10.80" />
-            <Entry retarderSpeed="4900.00" torqueLoss="11.00" />
-            <Entry retarderSpeed="5000.00" torqueLoss="11.30" />
-            <Entry retarderSpeed="5100.00" torqueLoss="11.50" />
-            <Entry retarderSpeed="5200.00" torqueLoss="11.80" />
-            <Entry retarderSpeed="5300.00" torqueLoss="12.00" />
-            <Entry retarderSpeed="5400.00" torqueLoss="12.30" />
-            <Entry retarderSpeed="5500.00" torqueLoss="12.60" />
-            <Entry retarderSpeed="5600.00" torqueLoss="12.80" />
-            <Entry retarderSpeed="5700.00" torqueLoss="13.10" />
-            <Entry retarderSpeed="5800.00" torqueLoss="13.40" />
-            <Entry retarderSpeed="5900.00" torqueLoss="13.70" />
-            <Entry retarderSpeed="6000.00" torqueLoss="14.00" />
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>RET-generic</Model>
+					<CertificationNumber>standard values</CertificationNumber>
+					<Date>2018-02-02T13:38:22.424664Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<RetarderLossMap>
+						<Entry retarderSpeed="0.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="100.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="200.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="300.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="400.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="500.00" torqueLoss="5.10"/>
+						<Entry retarderSpeed="600.00" torqueLoss="5.10"/>
+						<Entry retarderSpeed="700.00" torqueLoss="5.10"/>
+						<Entry retarderSpeed="800.00" torqueLoss="5.20"/>
+						<Entry retarderSpeed="900.00" torqueLoss="5.20"/>
+						<Entry retarderSpeed="1000.00" torqueLoss="5.30"/>
+						<Entry retarderSpeed="1100.00" torqueLoss="5.30"/>
+						<Entry retarderSpeed="1200.00" torqueLoss="5.40"/>
+						<Entry retarderSpeed="1300.00" torqueLoss="5.40"/>
+						<Entry retarderSpeed="1400.00" torqueLoss="5.50"/>
+						<Entry retarderSpeed="1500.00" torqueLoss="5.60"/>
+						<Entry retarderSpeed="1600.00" torqueLoss="5.60"/>
+						<Entry retarderSpeed="1700.00" torqueLoss="5.70"/>
+						<Entry retarderSpeed="1800.00" torqueLoss="5.80"/>
+						<Entry retarderSpeed="1900.00" torqueLoss="5.90"/>
+						<Entry retarderSpeed="2000.00" torqueLoss="6.00"/>
+						<Entry retarderSpeed="2100.00" torqueLoss="6.10"/>
+						<Entry retarderSpeed="2200.00" torqueLoss="6.20"/>
+						<Entry retarderSpeed="2300.00" torqueLoss="6.30"/>
+						<Entry retarderSpeed="2400.00" torqueLoss="6.40"/>
+						<Entry retarderSpeed="2500.00" torqueLoss="6.60"/>
+						<Entry retarderSpeed="2600.00" torqueLoss="6.70"/>
+						<Entry retarderSpeed="2700.00" torqueLoss="6.80"/>
+						<Entry retarderSpeed="2800.00" torqueLoss="7.00"/>
+						<Entry retarderSpeed="2900.00" torqueLoss="7.10"/>
+						<Entry retarderSpeed="3000.00" torqueLoss="7.30"/>
+						<Entry retarderSpeed="3100.00" torqueLoss="7.40"/>
+						<Entry retarderSpeed="3200.00" torqueLoss="7.60"/>
+						<Entry retarderSpeed="3300.00" torqueLoss="7.70"/>
+						<Entry retarderSpeed="3400.00" torqueLoss="7.90"/>
+						<Entry retarderSpeed="3500.00" torqueLoss="8.10"/>
+						<Entry retarderSpeed="3600.00" torqueLoss="8.20"/>
+						<Entry retarderSpeed="3700.00" torqueLoss="8.40"/>
+						<Entry retarderSpeed="3800.00" torqueLoss="8.60"/>
+						<Entry retarderSpeed="3900.00" torqueLoss="8.80"/>
+						<Entry retarderSpeed="4000.00" torqueLoss="9.00"/>
+						<Entry retarderSpeed="4100.00" torqueLoss="9.20"/>
+						<Entry retarderSpeed="4200.00" torqueLoss="9.40"/>
+						<Entry retarderSpeed="4300.00" torqueLoss="9.60"/>
+						<Entry retarderSpeed="4400.00" torqueLoss="9.80"/>
+						<Entry retarderSpeed="4500.00" torqueLoss="10.10"/>
+						<Entry retarderSpeed="4600.00" torqueLoss="10.30"/>
+						<Entry retarderSpeed="4700.00" torqueLoss="10.50"/>
+						<Entry retarderSpeed="4800.00" torqueLoss="10.80"/>
+						<Entry retarderSpeed="4900.00" torqueLoss="11.00"/>
+						<Entry retarderSpeed="5000.00" torqueLoss="11.30"/>
+						<Entry retarderSpeed="5100.00" torqueLoss="11.50"/>
+						<Entry retarderSpeed="5200.00" torqueLoss="11.80"/>
+						<Entry retarderSpeed="5300.00" torqueLoss="12.00"/>
+						<Entry retarderSpeed="5400.00" torqueLoss="12.30"/>
+						<Entry retarderSpeed="5500.00" torqueLoss="12.60"/>
+						<Entry retarderSpeed="5600.00" torqueLoss="12.80"/>
+						<Entry retarderSpeed="5700.00" torqueLoss="13.10"/>
+						<Entry retarderSpeed="5800.00" torqueLoss="13.40"/>
+						<Entry retarderSpeed="5900.00" torqueLoss="13.70"/>
+						<Entry retarderSpeed="6000.00" torqueLoss="14.00"/>
 					</RetarderLossMap>
 				</Data>
 				<Signature>
@@ -3055,7 +3055,6 @@
 						<Entry inputSpeed="1300.00" inputTorque="24000.00" torqueLoss="400.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="25000.00" torqueLoss="415.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="26000.00" torqueLoss="430.00"/>
-
 						<Entry inputSpeed="1300.00" inputTorque="27000.00" torqueLoss="445.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="28000.00" torqueLoss="460.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="29000.00" torqueLoss="475.00"/>
@@ -3338,19 +3337,18 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>true</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
index f9ae42448f..56c01167a5 100644
--- a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml	
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>6x2</AxleConfiguration>
-    <Articulated>true</Articulated>
+		<Articulated>true</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>32000</TechnicalPermissibleMaximumLadenMass>
 		<IdlingSpeed>600</IdlingSpeed>
 		<RetarderType>Transmission Output Retarder</RetarderType>
@@ -46,138 +46,138 @@
 					<CFNCV>1.0000</CFNCV>
 					<FuelType>Diesel CI</FuelType>
 					<FuelConsumptionMap>
-							<Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00" />
-							<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00" />
-							<Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75" />
-							<Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91" />
-							<Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95" />
-							<Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27" />
-							<Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00" />
-							<Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45" />
-							<Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57" />
-							<Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68" />
-							<Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80" />
-							<Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92" />
-							<Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00" />
-							<Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69" />
-							<Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77" />
-							<Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06" />
-							<Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92" />
-							<Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55" />
-							<Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09" />
-							<Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44" />
-							<Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90" />
-							<Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02" />
-							<Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05" />
-							<Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96" />
-							<Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00" />
-							<Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15" />
-							<Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49" />
-							<Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43" />
-							<Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87" />
-							<Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49" />
-							<Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62" />
-							<Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10" />
-							<Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31" />
-							<Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18" />
-							<Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40" />
-							<Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09" />
-							<Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00" />
-							<Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21" />
-							<Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69" />
-							<Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67" />
-							<Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76" />
-							<Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71" />
-							<Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70" />
-							<Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40" />
-							<Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65" />
-							<Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67" />
-							<Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29" />
-							<Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72" />
-							<Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00" />
-							<Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21" />
-							<Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55" />
-							<Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50" />
-							<Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59" />
-							<Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22" />
-							<Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81" />
-							<Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77" />
-							<Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22" />
-							<Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60" />
-							<Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89" />
-							<Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10" />
-							<Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00" />
-							<Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15" />
-							<Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52" />
-							<Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44" />
-							<Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41" />
-							<Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61" />
-							<Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71" />
-							<Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01" />
-							<Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96" />
-							<Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37" />
-							<Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97" />
-							<Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23" />
-							<Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00" />
-							<Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84" />
-							<Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80" />
-							<Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69" />
-							<Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18" />
-							<Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30" />
-							<Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33" />
-							<Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82" />
-							<Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91" />
-							<Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82" />
-							<Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52" />
-							<Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14" />
-							<Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00" />
-							<Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40" />
-							<Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91" />
-							<Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19" />
-							<Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18" />
-							<Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21" />
-							<Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36" />
-							<Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25" />
-							<Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48" />
-							<Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01" />
-							<Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92" />
-							<Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75" />
-							<Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00" />
-							<Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80" />
-							<Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09" />
-							<Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05" />
-							<Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56" />
-							<Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62" />
-							<Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51" />
-							<Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51" />
-							<Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25" />
-							<Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29" />
-							<Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45" />
-							<Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09" />
-							<Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00" />
-							<Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51" />
-							<Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55" />
-							<Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96" />
-							<Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46" />
-							<Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94" />
-							<Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10" />
-							<Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71" />
-							<Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15" />
-							<Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35" />
-							<Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10" />
-							<Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30" />
+						<Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00"/>
+						<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00"/>
+						<Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75"/>
+						<Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91"/>
+						<Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95"/>
+						<Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27"/>
+						<Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00"/>
+						<Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45"/>
+						<Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57"/>
+						<Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68"/>
+						<Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80"/>
+						<Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92"/>
+						<Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00"/>
+						<Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69"/>
+						<Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77"/>
+						<Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06"/>
+						<Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92"/>
+						<Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55"/>
+						<Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09"/>
+						<Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44"/>
+						<Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90"/>
+						<Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02"/>
+						<Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05"/>
+						<Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96"/>
+						<Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00"/>
+						<Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15"/>
+						<Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49"/>
+						<Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43"/>
+						<Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87"/>
+						<Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49"/>
+						<Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62"/>
+						<Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10"/>
+						<Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31"/>
+						<Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18"/>
+						<Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40"/>
+						<Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09"/>
+						<Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21"/>
+						<Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69"/>
+						<Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67"/>
+						<Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76"/>
+						<Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71"/>
+						<Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70"/>
+						<Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40"/>
+						<Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65"/>
+						<Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67"/>
+						<Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29"/>
+						<Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72"/>
+						<Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21"/>
+						<Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55"/>
+						<Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50"/>
+						<Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59"/>
+						<Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22"/>
+						<Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81"/>
+						<Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77"/>
+						<Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22"/>
+						<Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60"/>
+						<Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89"/>
+						<Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10"/>
+						<Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15"/>
+						<Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52"/>
+						<Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44"/>
+						<Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41"/>
+						<Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61"/>
+						<Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71"/>
+						<Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01"/>
+						<Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96"/>
+						<Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37"/>
+						<Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97"/>
+						<Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23"/>
+						<Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84"/>
+						<Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80"/>
+						<Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69"/>
+						<Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18"/>
+						<Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30"/>
+						<Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33"/>
+						<Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82"/>
+						<Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91"/>
+						<Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82"/>
+						<Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52"/>
+						<Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14"/>
+						<Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40"/>
+						<Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91"/>
+						<Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19"/>
+						<Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18"/>
+						<Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21"/>
+						<Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36"/>
+						<Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25"/>
+						<Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48"/>
+						<Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01"/>
+						<Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92"/>
+						<Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75"/>
+						<Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80"/>
+						<Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09"/>
+						<Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05"/>
+						<Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56"/>
+						<Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62"/>
+						<Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51"/>
+						<Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51"/>
+						<Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25"/>
+						<Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29"/>
+						<Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45"/>
+						<Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09"/>
+						<Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51"/>
+						<Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55"/>
+						<Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96"/>
+						<Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46"/>
+						<Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94"/>
+						<Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10"/>
+						<Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71"/>
+						<Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15"/>
+						<Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35"/>
+						<Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10"/>
+						<Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30"/>
 					</FuelConsumptionMap>
 					<FullLoadAndDragCurve>
-							<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
-							<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-							<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-							<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-							<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-							<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-							<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-							<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-							<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-							<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+						<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+						<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+						<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+						<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+						<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+						<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+						<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+						<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+						<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+						<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
 					</FullLoadAndDragCurve>
 				</v2.0:Data>
 				<Signature>
@@ -1308,776 +1308,776 @@
 					<Ratio>6.500</Ratio>
 					<CertificationMethod>Standard values</CertificationMethod>
 					<TorqueLossMap>
-							<Entry inputSpeed='0.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='0.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='0.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='0.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='0.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='0.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='0.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='0.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='0.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='0.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='0.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='0.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='0.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='0.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='0.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='0.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='0.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='0.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='0.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='0.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='0.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='0.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='0.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='0.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='0.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='0.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='0.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='0.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='0.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='0.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='0.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='0.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='0.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='0.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='0.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='325.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='325.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='325.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='325.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='325.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='325.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='325.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='325.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='325.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='325.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='325.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='325.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='325.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='325.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='325.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='325.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='325.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='325.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='325.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='325.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='325.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='325.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='325.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='325.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='325.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='325.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='325.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='325.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='325.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='325.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='325.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='325.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='325.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='325.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='325.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='650.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='650.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='650.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='650.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='650.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='650.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='650.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='650.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='650.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='650.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='650.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='650.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='650.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='650.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='650.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='650.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='650.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='650.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='650.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='650.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='650.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='650.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='650.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='650.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='650.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='650.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='650.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='650.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='650.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='650.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='650.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='650.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='650.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='650.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='650.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='975.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='975.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='975.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='975.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='975.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='975.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='975.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='975.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='975.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='975.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='975.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='975.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='975.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='975.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='975.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='975.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='975.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='975.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='975.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='975.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='975.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='975.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='975.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='975.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='975.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='975.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='975.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='975.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='975.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='975.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='975.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='975.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='975.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='975.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='975.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='1300.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='1300.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='1300.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='1300.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='1300.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='1300.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='1300.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='1300.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='1300.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='1300.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='1300.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='1300.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='1300.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='1300.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='1300.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='1300.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='1300.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='1300.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='1300.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='1300.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='1300.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='1300.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='1300.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='1300.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='1300.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='1300.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='1300.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='1300.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='1300.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='1300.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='1300.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='1300.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='1300.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='1300.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='1300.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='1625.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='1625.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='1625.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='1625.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='1625.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='1625.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='1625.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='1625.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='1625.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='1625.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='1625.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='1625.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='1625.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='1625.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='1625.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='1625.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='1625.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='1625.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='1625.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='1625.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='1625.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='1625.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='1625.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='1625.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='1625.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='1625.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='1625.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='1625.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='1625.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='1625.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='1625.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='1625.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='1625.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='1625.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='1625.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='1950.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='1950.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='1950.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='1950.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='1950.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='1950.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='1950.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='1950.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='1950.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='1950.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='1950.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='1950.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='1950.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='1950.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='1950.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='1950.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='1950.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='1950.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='1950.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='1950.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='1950.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='1950.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='1950.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='1950.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='1950.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='1950.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='1950.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='1950.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='1950.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='1950.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='1950.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='1950.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='1950.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='1950.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='1950.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='2275.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='2275.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='2275.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='2275.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='2275.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='2275.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='2275.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='2275.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='2275.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='2275.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='2275.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='2275.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='2275.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='2275.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='2275.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='2275.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='2275.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='2275.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='2275.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='2275.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='2275.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='2275.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='2275.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='2275.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='2275.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='2275.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='2275.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='2275.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='2275.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='2275.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='2275.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='2275.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='2275.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='2275.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='2275.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='2600.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='2600.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='2600.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='2600.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='2600.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='2600.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='2600.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='2600.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='2600.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='2600.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='2600.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='2600.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='2600.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='2600.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='2600.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='2600.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='2600.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='2600.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='2600.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='2600.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='2600.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='2600.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='2600.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='2600.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='2600.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='2600.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='2600.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='2600.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='2600.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='2600.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='2600.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='2600.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='2600.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='2600.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='2600.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='2925.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='2925.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='2925.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='2925.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='2925.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='2925.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='2925.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='2925.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='2925.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='2925.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='2925.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='2925.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='2925.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='2925.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='2925.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='2925.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='2925.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='2925.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='2925.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='2925.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='2925.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='2925.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='2925.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='2925.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='2925.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='2925.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='2925.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='2925.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='2925.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='2925.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='2925.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='2925.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='2925.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='2925.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='2925.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='3750.00' inputTorque='31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='3750.00' inputTorque='70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='3750.00' inputTorque='110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='3750.00' inputTorque='149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='3750.00' inputTorque='189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='3750.00' inputTorque='268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='3750.00' inputTorque='347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='3750.00' inputTorque='506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='3750.00' inputTorque='665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='3750.00' inputTorque='823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='3750.00' inputTorque='982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='3750.00' inputTorque='1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='3750.00' inputTorque='1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='3750.00' inputTorque='1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='3750.00' inputTorque='1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='3750.00' inputTorque='1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='3750.00' inputTorque='2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='3750.00' inputTorque='2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='3750.00' inputTorque='2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='3750.00' inputTorque='3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='3750.00' inputTorque='3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='3750.00' inputTorque='3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='3750.00' inputTorque='4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='3750.00' inputTorque='4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='3750.00' inputTorque='4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='3750.00' inputTorque='5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='3750.00' inputTorque='5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='3750.00' inputTorque='5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='3750.00' inputTorque='6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='3750.00' inputTorque='6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='3750.00' inputTorque='6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='3750.00' inputTorque='7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='3750.00' inputTorque='7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='3750.00' inputTorque='7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='3750.00' inputTorque='7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='0.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='0.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='0.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='0.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='0.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='0.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='0.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='0.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='0.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='0.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='0.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='0.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='0.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='0.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='0.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='0.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='0.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='0.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='0.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='0.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='0.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='0.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='0.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='0.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='0.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='0.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='0.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='0.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='0.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='0.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='0.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='0.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='0.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='0.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='0.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='325.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='325.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='325.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='325.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='325.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='325.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='325.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='325.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='325.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='325.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='325.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='325.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='325.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='325.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='325.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='325.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='325.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='325.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='325.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='325.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='325.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='325.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='325.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='325.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='325.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='325.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='325.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='325.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='325.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='325.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='325.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='325.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='325.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='325.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='325.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='650.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='650.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='650.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='650.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='650.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='650.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='650.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='650.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='650.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='650.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='650.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='650.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='650.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='650.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='650.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='650.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='650.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='650.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='650.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='650.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='650.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='650.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='650.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='650.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='650.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='650.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='650.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='650.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='650.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='650.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='650.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='650.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='650.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='650.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='650.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='975.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='975.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='975.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='975.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='975.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='975.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='975.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='975.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='975.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='975.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='975.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='975.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='975.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='975.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='975.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='975.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='975.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='975.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='975.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='975.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='975.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='975.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='975.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='975.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='975.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='975.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='975.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='975.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='975.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='975.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='975.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='975.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='975.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='975.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='975.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='1300.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='1300.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='1300.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='1300.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='1300.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='1300.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='1300.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='1300.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='1300.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='1300.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='1300.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='1300.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='1300.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='1300.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='1300.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='1300.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='1300.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='1300.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='1300.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='1300.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='1300.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='1300.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='1300.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='1300.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='1300.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='1300.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='1300.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='1300.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='1300.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='1300.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='1300.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='1300.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='1300.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='1300.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='1300.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='1625.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='1625.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='1625.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='1625.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='1625.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='1625.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='1625.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='1625.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='1625.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='1625.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='1625.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='1625.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='1625.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='1625.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='1625.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='1625.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='1625.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='1625.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='1625.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='1625.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='1625.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='1625.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='1625.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='1625.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='1625.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='1625.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='1625.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='1625.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='1625.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='1625.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='1625.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='1625.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='1625.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='1625.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='1625.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='1950.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='1950.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='1950.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='1950.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='1950.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='1950.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='1950.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='1950.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='1950.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='1950.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='1950.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='1950.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='1950.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='1950.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='1950.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='1950.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='1950.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='1950.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='1950.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='1950.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='1950.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='1950.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='1950.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='1950.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='1950.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='1950.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='1950.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='1950.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='1950.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='1950.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='1950.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='1950.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='1950.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='1950.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='1950.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='2275.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='2275.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='2275.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='2275.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='2275.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='2275.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='2275.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='2275.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='2275.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='2275.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='2275.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='2275.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='2275.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='2275.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='2275.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='2275.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='2275.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='2275.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='2275.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='2275.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='2275.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='2275.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='2275.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='2275.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='2275.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='2275.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='2275.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='2275.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='2275.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='2275.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='2275.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='2275.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='2275.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='2275.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='2275.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='2600.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='2600.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='2600.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='2600.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='2600.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='2600.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='2600.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='2600.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='2600.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='2600.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='2600.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='2600.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='2600.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='2600.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='2600.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='2600.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='2600.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='2600.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='2600.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='2600.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='2600.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='2600.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='2600.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='2600.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='2600.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='2600.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='2600.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='2600.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='2600.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='2600.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='2600.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='2600.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='2600.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='2600.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='2600.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='2925.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='2925.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='2925.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='2925.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='2925.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='2925.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='2925.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='2925.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='2925.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='2925.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='2925.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='2925.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='2925.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='2925.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='2925.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='2925.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='2925.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='2925.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='2925.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='2925.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='2925.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='2925.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='2925.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='2925.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='2925.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='2925.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='2925.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='2925.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='2925.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='2925.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='2925.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='2925.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='2925.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='2925.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='2925.00' inputTorque='-7960.98' torqueLoss='268.68'/>
-							<Entry inputSpeed='3250.00' inputTorque='-31.96' torqueLoss='31.96'/>
-							<Entry inputSpeed='3250.00' inputTorque='-70.42' torqueLoss='31.96'/>
-							<Entry inputSpeed='3250.00' inputTorque='-110.07' torqueLoss='33.15'/>
-							<Entry inputSpeed='3250.00' inputTorque='-149.72' torqueLoss='34.34'/>
-							<Entry inputSpeed='3250.00' inputTorque='-189.37' torqueLoss='35.53'/>
-							<Entry inputSpeed='3750.00' inputTorque='-268.68' torqueLoss='37.91'/>
-							<Entry inputSpeed='3750.00' inputTorque='-347.98' torqueLoss='40.29'/>
-							<Entry inputSpeed='3750.00' inputTorque='-506.58' torqueLoss='45.04'/>
-							<Entry inputSpeed='3750.00' inputTorque='-665.19' torqueLoss='49.80'/>
-							<Entry inputSpeed='3750.00' inputTorque='-823.79' torqueLoss='54.56'/>
-							<Entry inputSpeed='3750.00' inputTorque='-982.39' torqueLoss='59.32'/>
-							<Entry inputSpeed='3750.00' inputTorque='-1141.00' torqueLoss='64.08'/>
-							<Entry inputSpeed='3750.00' inputTorque='-1299.60' torqueLoss='68.83'/>
-							<Entry inputSpeed='3750.00' inputTorque='-1458.21' torqueLoss='73.59'/>
-							<Entry inputSpeed='3750.00' inputTorque='-1616.81' torqueLoss='78.35'/>
-							<Entry inputSpeed='3750.00' inputTorque='-1934.02' torqueLoss='87.87'/>
-							<Entry inputSpeed='3750.00' inputTorque='-2251.23' torqueLoss='97.38'/>
-							<Entry inputSpeed='3750.00' inputTorque='-2568.44' torqueLoss='106.90'/>
-							<Entry inputSpeed='3750.00' inputTorque='-2885.65' torqueLoss='116.42'/>
-							<Entry inputSpeed='3750.00' inputTorque='-3202.85' torqueLoss='125.93'/>
-							<Entry inputSpeed='3750.00' inputTorque='-3520.06' torqueLoss='135.45'/>
-							<Entry inputSpeed='3750.00' inputTorque='-3837.27' torqueLoss='144.96'/>
-							<Entry inputSpeed='3750.00' inputTorque='-4154.48' torqueLoss='154.48'/>
-							<Entry inputSpeed='3750.00' inputTorque='-4471.69' torqueLoss='164.00'/>
-							<Entry inputSpeed='3750.00' inputTorque='-4788.90' torqueLoss='173.51'/>
-							<Entry inputSpeed='3750.00' inputTorque='-5106.11' torqueLoss='183.03'/>
-							<Entry inputSpeed='3750.00' inputTorque='-5423.31' torqueLoss='192.55'/>
-							<Entry inputSpeed='3750.00' inputTorque='-5740.52' torqueLoss='202.06'/>
-							<Entry inputSpeed='3750.00' inputTorque='-6057.73' torqueLoss='211.58'/>
-							<Entry inputSpeed='3750.00' inputTorque='-6374.94' torqueLoss='221.09'/>
-							<Entry inputSpeed='3750.00' inputTorque='-6692.15' torqueLoss='230.61'/>
-							<Entry inputSpeed='3750.00' inputTorque='-7009.36' torqueLoss='240.13'/>
-							<Entry inputSpeed='3750.00' inputTorque='-7326.57' torqueLoss='249.64'/>
-							<Entry inputSpeed='3750.00' inputTorque='-7643.77' torqueLoss='259.16'/>
-							<Entry inputSpeed='3750.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='0.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='0.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='0.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='0.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='0.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='0.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='0.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='0.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='0.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='0.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='0.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='0.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='0.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='0.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='0.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='0.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='0.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='0.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='0.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='0.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='0.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='0.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='0.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='0.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='0.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='0.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='0.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='0.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='0.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='0.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='0.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='0.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='0.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='0.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='0.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='325.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='325.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='325.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='325.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='325.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='325.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='325.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='325.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='325.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='325.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='325.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='325.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='325.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='325.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='325.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='325.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='325.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='325.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='325.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='325.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='325.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='325.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='325.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='325.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='325.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='325.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='325.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='325.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='325.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='325.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='325.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='325.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='325.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='325.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='325.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='650.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='650.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='650.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='650.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='650.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='650.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='650.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='650.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='650.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='650.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='650.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='650.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='650.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='650.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='650.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='650.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='650.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='650.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='650.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='650.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='650.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='650.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='650.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='650.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='650.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='650.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='650.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='650.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='650.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='650.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='650.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='650.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='650.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='650.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='650.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='975.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='975.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='975.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='975.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='975.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='975.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='975.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='975.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='975.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='975.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='975.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='975.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='975.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='975.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='975.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='975.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='975.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='975.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='975.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='975.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='975.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='975.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='975.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='975.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='975.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='975.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='975.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='975.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='975.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='975.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='975.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='975.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='975.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='975.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='975.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='1300.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='1300.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='1300.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='1300.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='1300.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='1300.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='1300.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='1300.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='1300.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='1300.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='1300.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='1300.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='1300.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='1300.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='1300.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='1300.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='1300.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='1300.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='1300.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='1300.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='1300.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='1300.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='1300.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='1300.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='1300.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='1300.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='1300.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='1300.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='1300.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='1300.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='1300.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='1300.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='1300.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='1300.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='1300.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='1625.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='1625.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='1625.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='1625.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='1625.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='1625.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='1625.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='1625.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='1625.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='1625.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='1625.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='1625.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='1625.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='1625.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='1625.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='1625.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='1625.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='1625.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='1625.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='1625.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='1625.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='1625.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='1625.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='1625.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='1625.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='1625.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='1625.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='1625.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='1625.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='1625.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='1625.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='1625.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='1625.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='1625.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='1625.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='1950.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='1950.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='1950.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='1950.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='1950.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='1950.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='1950.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='1950.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='1950.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='1950.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='1950.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='1950.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='1950.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='1950.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='1950.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='1950.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='1950.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='1950.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='1950.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='1950.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='1950.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='1950.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='1950.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='1950.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='1950.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='1950.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='1950.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='1950.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='1950.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='1950.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='1950.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='1950.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='1950.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='1950.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='1950.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='2275.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='2275.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='2275.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='2275.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='2275.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='2275.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='2275.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='2275.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='2275.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='2275.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='2275.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='2275.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='2275.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='2275.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='2275.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='2275.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='2275.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='2275.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='2275.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='2275.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='2275.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='2275.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='2275.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='2275.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='2275.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='2275.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='2275.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='2275.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='2275.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='2275.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='2275.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='2275.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='2275.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='2275.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='2275.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='2600.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='2600.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='2600.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='2600.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='2600.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='2600.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='2600.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='2600.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='2600.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='2600.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='2600.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='2600.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='2600.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='2600.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='2600.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='2600.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='2600.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='2600.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='2600.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='2600.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='2600.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='2600.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='2600.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='2600.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='2600.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='2600.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='2600.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='2600.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='2600.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='2600.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='2600.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='2600.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='2600.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='2600.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='2600.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='2925.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='2925.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='2925.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='2925.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='2925.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='2925.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='2925.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='2925.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='2925.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='2925.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='2925.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='2925.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='2925.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='2925.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='2925.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='2925.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='2925.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='2925.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='2925.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='2925.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='2925.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='2925.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='2925.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='2925.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='2925.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='2925.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='2925.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='2925.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='2925.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='2925.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='2925.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='2925.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='2925.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='2925.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='2925.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='3750.00' inputTorque='31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='3750.00' inputTorque='70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='3750.00' inputTorque='110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='3750.00' inputTorque='149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='3750.00' inputTorque='189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='3750.00' inputTorque='268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='3750.00' inputTorque='347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='3750.00' inputTorque='506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='3750.00' inputTorque='665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='3750.00' inputTorque='823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='3750.00' inputTorque='982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='3750.00' inputTorque='1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='3750.00' inputTorque='1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='3750.00' inputTorque='1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='3750.00' inputTorque='1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='3750.00' inputTorque='1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='3750.00' inputTorque='2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='3750.00' inputTorque='2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='3750.00' inputTorque='2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='3750.00' inputTorque='3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='3750.00' inputTorque='3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='3750.00' inputTorque='3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='3750.00' inputTorque='4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='3750.00' inputTorque='4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='3750.00' inputTorque='4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='3750.00' inputTorque='5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='3750.00' inputTorque='5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='3750.00' inputTorque='5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='3750.00' inputTorque='6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='3750.00' inputTorque='6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='3750.00' inputTorque='6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='3750.00' inputTorque='7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='3750.00' inputTorque='7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='3750.00' inputTorque='7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='3750.00' inputTorque='7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='0.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='0.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='0.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='0.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='0.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='0.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='0.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='0.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='0.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='0.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='0.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='0.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='0.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='0.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='0.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='0.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='0.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='0.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='0.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='0.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='0.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='0.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='0.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='0.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='0.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='0.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='0.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='0.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='0.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='0.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='0.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='0.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='0.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='0.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='0.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='325.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='325.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='325.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='325.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='325.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='325.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='325.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='325.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='325.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='325.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='325.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='325.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='325.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='325.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='325.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='325.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='325.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='325.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='325.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='325.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='325.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='325.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='325.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='325.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='325.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='325.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='325.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='325.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='325.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='325.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='325.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='325.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='325.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='325.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='325.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='650.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='650.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='650.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='650.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='650.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='650.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='650.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='650.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='650.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='650.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='650.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='650.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='650.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='650.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='650.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='650.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='650.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='650.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='650.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='650.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='650.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='650.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='650.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='650.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='650.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='650.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='650.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='650.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='650.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='650.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='650.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='650.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='650.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='650.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='650.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='975.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='975.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='975.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='975.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='975.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='975.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='975.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='975.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='975.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='975.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='975.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='975.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='975.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='975.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='975.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='975.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='975.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='975.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='975.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='975.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='975.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='975.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='975.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='975.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='975.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='975.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='975.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='975.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='975.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='975.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='975.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='975.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='975.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='975.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='975.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='1300.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='1300.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='1300.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='1300.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='1300.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='1300.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='1300.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='1300.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='1300.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='1300.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='1300.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='1300.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='1300.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='1300.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='1300.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='1300.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='1300.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='1300.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='1300.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='1300.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='1300.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='1300.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='1300.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='1300.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='1300.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='1300.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='1300.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='1300.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='1300.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='1300.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='1300.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='1300.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='1300.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='1300.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='1300.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='1625.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='1625.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='1625.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='1625.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='1625.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='1625.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='1625.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='1625.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='1625.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='1625.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='1625.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='1625.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='1625.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='1625.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='1625.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='1625.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='1625.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='1625.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='1625.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='1625.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='1625.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='1625.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='1625.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='1625.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='1625.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='1625.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='1625.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='1625.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='1625.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='1625.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='1625.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='1625.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='1625.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='1625.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='1625.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='1950.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='1950.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='1950.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='1950.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='1950.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='1950.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='1950.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='1950.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='1950.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='1950.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='1950.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='1950.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='1950.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='1950.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='1950.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='1950.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='1950.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='1950.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='1950.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='1950.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='1950.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='1950.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='1950.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='1950.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='1950.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='1950.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='1950.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='1950.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='1950.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='1950.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='1950.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='1950.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='1950.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='1950.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='1950.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='2275.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='2275.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='2275.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='2275.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='2275.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='2275.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='2275.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='2275.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='2275.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='2275.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='2275.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='2275.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='2275.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='2275.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='2275.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='2275.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='2275.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='2275.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='2275.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='2275.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='2275.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='2275.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='2275.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='2275.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='2275.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='2275.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='2275.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='2275.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='2275.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='2275.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='2275.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='2275.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='2275.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='2275.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='2275.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='2600.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='2600.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='2600.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='2600.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='2600.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='2600.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='2600.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='2600.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='2600.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='2600.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='2600.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='2600.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='2600.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='2600.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='2600.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='2600.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='2600.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='2600.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='2600.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='2600.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='2600.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='2600.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='2600.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='2600.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='2600.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='2600.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='2600.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='2600.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='2600.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='2600.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='2600.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='2600.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='2600.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='2600.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='2600.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='2925.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='2925.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='2925.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='2925.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='2925.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='2925.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='2925.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='2925.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='2925.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='2925.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='2925.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='2925.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='2925.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='2925.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='2925.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='2925.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='2925.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='2925.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='2925.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='2925.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='2925.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='2925.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='2925.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='2925.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='2925.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='2925.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='2925.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='2925.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='2925.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='2925.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='2925.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='2925.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='2925.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='2925.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='2925.00' inputTorque='-7960.98' torqueLoss='268.68'/>
+						<Entry inputSpeed='3250.00' inputTorque='-31.96' torqueLoss='31.96'/>
+						<Entry inputSpeed='3250.00' inputTorque='-70.42' torqueLoss='31.96'/>
+						<Entry inputSpeed='3250.00' inputTorque='-110.07' torqueLoss='33.15'/>
+						<Entry inputSpeed='3250.00' inputTorque='-149.72' torqueLoss='34.34'/>
+						<Entry inputSpeed='3250.00' inputTorque='-189.37' torqueLoss='35.53'/>
+						<Entry inputSpeed='3750.00' inputTorque='-268.68' torqueLoss='37.91'/>
+						<Entry inputSpeed='3750.00' inputTorque='-347.98' torqueLoss='40.29'/>
+						<Entry inputSpeed='3750.00' inputTorque='-506.58' torqueLoss='45.04'/>
+						<Entry inputSpeed='3750.00' inputTorque='-665.19' torqueLoss='49.80'/>
+						<Entry inputSpeed='3750.00' inputTorque='-823.79' torqueLoss='54.56'/>
+						<Entry inputSpeed='3750.00' inputTorque='-982.39' torqueLoss='59.32'/>
+						<Entry inputSpeed='3750.00' inputTorque='-1141.00' torqueLoss='64.08'/>
+						<Entry inputSpeed='3750.00' inputTorque='-1299.60' torqueLoss='68.83'/>
+						<Entry inputSpeed='3750.00' inputTorque='-1458.21' torqueLoss='73.59'/>
+						<Entry inputSpeed='3750.00' inputTorque='-1616.81' torqueLoss='78.35'/>
+						<Entry inputSpeed='3750.00' inputTorque='-1934.02' torqueLoss='87.87'/>
+						<Entry inputSpeed='3750.00' inputTorque='-2251.23' torqueLoss='97.38'/>
+						<Entry inputSpeed='3750.00' inputTorque='-2568.44' torqueLoss='106.90'/>
+						<Entry inputSpeed='3750.00' inputTorque='-2885.65' torqueLoss='116.42'/>
+						<Entry inputSpeed='3750.00' inputTorque='-3202.85' torqueLoss='125.93'/>
+						<Entry inputSpeed='3750.00' inputTorque='-3520.06' torqueLoss='135.45'/>
+						<Entry inputSpeed='3750.00' inputTorque='-3837.27' torqueLoss='144.96'/>
+						<Entry inputSpeed='3750.00' inputTorque='-4154.48' torqueLoss='154.48'/>
+						<Entry inputSpeed='3750.00' inputTorque='-4471.69' torqueLoss='164.00'/>
+						<Entry inputSpeed='3750.00' inputTorque='-4788.90' torqueLoss='173.51'/>
+						<Entry inputSpeed='3750.00' inputTorque='-5106.11' torqueLoss='183.03'/>
+						<Entry inputSpeed='3750.00' inputTorque='-5423.31' torqueLoss='192.55'/>
+						<Entry inputSpeed='3750.00' inputTorque='-5740.52' torqueLoss='202.06'/>
+						<Entry inputSpeed='3750.00' inputTorque='-6057.73' torqueLoss='211.58'/>
+						<Entry inputSpeed='3750.00' inputTorque='-6374.94' torqueLoss='221.09'/>
+						<Entry inputSpeed='3750.00' inputTorque='-6692.15' torqueLoss='230.61'/>
+						<Entry inputSpeed='3750.00' inputTorque='-7009.36' torqueLoss='240.13'/>
+						<Entry inputSpeed='3750.00' inputTorque='-7326.57' torqueLoss='249.64'/>
+						<Entry inputSpeed='3750.00' inputTorque='-7643.77' torqueLoss='259.16'/>
+						<Entry inputSpeed='3750.00' inputTorque='-7960.98' torqueLoss='268.68'/>
 					</TorqueLossMap>
 				</Data>
 				<Signature>
@@ -2187,17 +2187,18 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
index 30df4a3406..3e710f5c42 100644
--- a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml	
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartES-PS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>8x2</AxleConfiguration>
-    <Articulated>false</Articulated>
+		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>29250</TechnicalPermissibleMaximumLadenMass>
 		<IdlingSpeed>600</IdlingSpeed>
 		<RetarderType>Transmission Output Retarder</RetarderType>
@@ -1283,7 +1283,6 @@
 								<Entry inputSpeed="1100.00" inputTorque="-350.00" torqueLoss="17.63"/>
 								<Entry inputSpeed="1100.00" inputTorque="-150.00" torqueLoss="13.63"/>
 								<Entry inputSpeed="1100.00" inputTorque="50.00" torqueLoss="11.63"/>
-
 								<Entry inputSpeed="1100.00" inputTorque="250.00" torqueLoss="15.63"/>
 								<Entry inputSpeed="1100.00" inputTorque="450.00" torqueLoss="19.63"/>
 								<Entry inputSpeed="1100.00" inputTorque="650.00" torqueLoss="23.63"/>
@@ -2449,7 +2448,6 @@
 								<Entry inputSpeed="700.00" inputTorque="1250.00" torqueLoss="14.85"/>
 								<Entry inputSpeed="700.00" inputTorque="1450.00" torqueLoss="15.85"/>
 								<Entry inputSpeed="700.00" inputTorque="1650.00" torqueLoss="16.85"/>
-
 								<Entry inputSpeed="700.00" inputTorque="1850.00" torqueLoss="17.85"/>
 								<Entry inputSpeed="700.00" inputTorque="2050.00" torqueLoss="18.85"/>
 								<Entry inputSpeed="700.00" inputTorque="2250.00" torqueLoss="19.85"/>
@@ -3321,19 +3319,27 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>true</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>smart</AlternatorTechnology>
+						<SmartAlternator>
+							<RatedCurrent>310</RatedCurrent>
+							<RatedVoltage>48</RatedVoltage>
+						</SmartAlternator>
+						<Battery>
+							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+							<RatedCapacity>1</RatedCapacity>
+							<NominalVoltage>48</NominalVoltage>
+						</Battery>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>true</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
index 0880ce6fec..6c21b1f947 100644
--- a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart-ESS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>8x2</AxleConfiguration>
 		<Articulated>true</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
@@ -1433,7 +1433,7 @@
 								</Signature>
 							</Tyre>
 						</Axle>
-							<Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
+						<Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
 							<AxleType>VehicleNonDriven</AxleType>
 							<TwinTyres>false</TwinTyres>
 							<Steered>false</Steered>
@@ -1472,17 +1472,18 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml b/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml
index 250df1d708..b3493936e3 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
+		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
@@ -36,7 +36,7 @@
 					<Displacement>7700</Displacement>
 					<IdlingSpeed>700</IdlingSpeed>
 					<RatedSpeed>2200</RatedSpeed>
-					<RatedPower>220000</RatedPower>
+					<RatedPower>200000</RatedPower>
 					<MaxEngineTorque>1100</MaxEngineTorque>
 					<WHTCUrban>1.0600</WHTCUrban>
 					<WHTCRural>1.0300</WHTCRural>
@@ -2188,19 +2188,27 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>true</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>smart</AlternatorTechnology>
+						<SmartAlternator>
+							<RatedCurrent>310</RatedCurrent>
+							<RatedVoltage>48</RatedVoltage>
+						</SmartAlternator>
+						<Battery>
+							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+							<RatedCapacity>1</RatedCapacity>
+							<NominalVoltage>48</NominalVoltage>
+						</Battery>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml
index ee9ea1cb21..86413c8e46 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -1,29 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
-		<Model>Sample Bus Model</Model>
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
-		<LegislativeClass>M3</LegislativeClass>
-		<ClassBus>II</ClassBus>
-		<VehicleCode>CE</VehicleCode>
-		<CurbMassChassis>10680</CurbMassChassis>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<RegisteredPassengers>
-			<LowerDeck>86</LowerDeck>
-			<UpperDeck>0</UpperDeck>
-		</RegisteredPassengers>
+		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<ClassBus>II</ClassBus>
+			<NumberPassengersLowerDeck>86</NumberPassengersLowerDeck>
+			<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+		<BodyworkCode>CE</BodyworkCode>
 		<LowEntry>true</LowEntry>
-		<HeightIntegratedBody>3.000</HeightIntegratedBody>
-		<VehicleLength>10.633</VehicleLength>
-		<VehicleWidth>2.550</VehicleWidth>
-		<EntranceHeight>0.270</EntranceHeight>
+		<HeightIntegratedBody>3000</HeightIntegratedBody>
+		<VehicleLength>10633</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>270</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
-			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+			<AirDrag>
+				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -33,7 +41,7 @@
 					<TransferredCdxA>4.90</TransferredCdxA>
 					<DeclaredCdxA>4.90</DeclaredCdxA>
 				</Data>
-				<Signature>
+				<v2.0:Signature>
 					<di:Reference URI="#CabinX23h">
 						<di:Transforms>
 							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -42,29 +50,27 @@
 						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 					</di:Reference>
-				</Signature>
-			</v2.6:AirDrag>
+				</v2.0:Signature>
+			</AirDrag>
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
 						<LEDLights>
+							<Interiorlights>true</Interiorlights>
 							<Dayrunninglights>true</Dayrunninglights>
-							<Headlights>true</Headlights>
 							<Positionlights>true</Positionlights>
 							<Brakelights>true</Brakelights>
-							<Interiorlights>true</Interiorlights>
+							<Headlights>true</Headlights>
 						</LEDLights>
 					</ElectricSystem>
 					<HVAC>
 						<SystemConfiguration>6</SystemConfiguration>
-						<CompressorType>
-							<DriverAC>none</DriverAC>
-							<PassengerAC>2-stage</PassengerAC>
-						</CompressorType>
+						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>N.A.</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
 						<AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
 						<DoubleGlazing>true</DoubleGlazing>
-						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
 					</HVAC>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml b/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml
index 48caa0c3f0..7ca77eecbb 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
+		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartPS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>6x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -47,138 +47,138 @@
 					<CFNCV>1.0000</CFNCV>
 					<FuelType>Diesel CI</FuelType>
 					<FuelConsumptionMap>
-							<Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00" />
-							<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00" />
-							<Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75" />
-							<Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91" />
-							<Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95" />
-							<Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27" />
-							<Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00" />
-							<Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45" />
-							<Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57" />
-							<Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68" />
-							<Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80" />
-							<Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92" />
-							<Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00" />
-							<Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69" />
-							<Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77" />
-							<Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06" />
-							<Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92" />
-							<Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55" />
-							<Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09" />
-							<Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44" />
-							<Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90" />
-							<Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02" />
-							<Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05" />
-							<Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96" />
-							<Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00" />
-							<Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15" />
-							<Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49" />
-							<Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43" />
-							<Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87" />
-							<Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49" />
-							<Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62" />
-							<Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10" />
-							<Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31" />
-							<Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18" />
-							<Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40" />
-							<Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09" />
-							<Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00" />
-							<Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21" />
-							<Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69" />
-							<Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67" />
-							<Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76" />
-							<Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71" />
-							<Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70" />
-							<Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40" />
-							<Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65" />
-							<Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67" />
-							<Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29" />
-							<Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72" />
-							<Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00" />
-							<Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21" />
-							<Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55" />
-							<Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50" />
-							<Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59" />
-							<Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22" />
-							<Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81" />
-							<Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77" />
-							<Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22" />
-							<Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60" />
-							<Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89" />
-							<Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10" />
-							<Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00" />
-							<Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15" />
-							<Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52" />
-							<Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44" />
-							<Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41" />
-							<Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61" />
-							<Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71" />
-							<Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01" />
-							<Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96" />
-							<Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37" />
-							<Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97" />
-							<Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23" />
-							<Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00" />
-							<Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84" />
-							<Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80" />
-							<Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69" />
-							<Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18" />
-							<Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30" />
-							<Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33" />
-							<Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82" />
-							<Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91" />
-							<Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82" />
-							<Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52" />
-							<Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14" />
-							<Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00" />
-							<Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40" />
-							<Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91" />
-							<Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19" />
-							<Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18" />
-							<Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21" />
-							<Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36" />
-							<Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25" />
-							<Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48" />
-							<Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01" />
-							<Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92" />
-							<Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75" />
-							<Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00" />
-							<Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80" />
-							<Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09" />
-							<Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05" />
-							<Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56" />
-							<Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62" />
-							<Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51" />
-							<Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51" />
-							<Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25" />
-							<Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29" />
-							<Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45" />
-							<Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09" />
-							<Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00" />
-							<Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51" />
-							<Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55" />
-							<Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96" />
-							<Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46" />
-							<Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94" />
-							<Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10" />
-							<Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71" />
-							<Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15" />
-							<Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35" />
-							<Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10" />
-							<Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30" />
+						<Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00"/>
+						<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00"/>
+						<Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75"/>
+						<Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91"/>
+						<Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95"/>
+						<Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27"/>
+						<Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00"/>
+						<Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45"/>
+						<Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57"/>
+						<Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68"/>
+						<Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80"/>
+						<Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92"/>
+						<Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00"/>
+						<Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69"/>
+						<Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77"/>
+						<Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06"/>
+						<Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92"/>
+						<Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55"/>
+						<Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09"/>
+						<Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44"/>
+						<Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90"/>
+						<Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02"/>
+						<Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05"/>
+						<Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96"/>
+						<Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00"/>
+						<Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15"/>
+						<Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49"/>
+						<Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43"/>
+						<Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87"/>
+						<Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49"/>
+						<Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62"/>
+						<Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10"/>
+						<Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31"/>
+						<Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18"/>
+						<Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40"/>
+						<Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09"/>
+						<Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21"/>
+						<Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69"/>
+						<Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67"/>
+						<Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76"/>
+						<Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71"/>
+						<Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70"/>
+						<Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40"/>
+						<Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65"/>
+						<Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67"/>
+						<Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29"/>
+						<Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72"/>
+						<Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21"/>
+						<Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55"/>
+						<Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50"/>
+						<Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59"/>
+						<Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22"/>
+						<Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81"/>
+						<Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77"/>
+						<Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22"/>
+						<Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60"/>
+						<Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89"/>
+						<Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10"/>
+						<Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15"/>
+						<Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52"/>
+						<Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44"/>
+						<Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41"/>
+						<Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61"/>
+						<Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71"/>
+						<Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01"/>
+						<Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96"/>
+						<Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37"/>
+						<Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97"/>
+						<Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23"/>
+						<Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84"/>
+						<Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80"/>
+						<Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69"/>
+						<Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18"/>
+						<Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30"/>
+						<Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33"/>
+						<Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82"/>
+						<Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91"/>
+						<Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82"/>
+						<Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52"/>
+						<Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14"/>
+						<Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40"/>
+						<Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91"/>
+						<Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19"/>
+						<Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18"/>
+						<Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21"/>
+						<Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36"/>
+						<Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25"/>
+						<Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48"/>
+						<Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01"/>
+						<Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92"/>
+						<Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75"/>
+						<Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80"/>
+						<Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09"/>
+						<Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05"/>
+						<Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56"/>
+						<Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62"/>
+						<Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51"/>
+						<Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51"/>
+						<Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25"/>
+						<Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29"/>
+						<Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45"/>
+						<Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09"/>
+						<Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51"/>
+						<Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55"/>
+						<Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96"/>
+						<Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46"/>
+						<Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94"/>
+						<Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10"/>
+						<Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71"/>
+						<Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15"/>
+						<Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35"/>
+						<Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10"/>
+						<Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30"/>
 					</FuelConsumptionMap>
 					<FullLoadAndDragCurve>
-							<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
-							<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-							<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-							<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-							<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-							<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-							<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-							<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-							<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-							<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+						<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+						<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+						<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+						<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+						<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+						<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+						<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+						<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+						<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+						<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
 					</FullLoadAndDragCurve>
 				</v2.0:Data>
 				<Signature>
@@ -2644,74 +2644,74 @@
 			</v2.6:Angledrive>
 			<v2.6:Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
 				<Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
-						<Manufacturer>Generic Vendor</Manufacturer>
-						<Model>RET-generic</Model>
-						<CertificationNumber>standard values</CertificationNumber>
-						<Date>2018-02-02T13:38:22.424664Z</Date>
-						<AppVersion>VectoCore</AppVersion>
-						<CertificationMethod>Standard values</CertificationMethod>
-          <RetarderLossMap>
-            <Entry retarderSpeed="0.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="100.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="200.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="300.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="400.00" torqueLoss="5.00" />
-            <Entry retarderSpeed="500.00" torqueLoss="5.10" />
-            <Entry retarderSpeed="600.00" torqueLoss="5.10" />
-            <Entry retarderSpeed="700.00" torqueLoss="5.10" />
-            <Entry retarderSpeed="800.00" torqueLoss="5.20" />
-            <Entry retarderSpeed="900.00" torqueLoss="5.20" />
-            <Entry retarderSpeed="1000.00" torqueLoss="5.30" />
-            <Entry retarderSpeed="1100.00" torqueLoss="5.30" />
-            <Entry retarderSpeed="1200.00" torqueLoss="5.40" />
-            <Entry retarderSpeed="1300.00" torqueLoss="5.40" />
-            <Entry retarderSpeed="1400.00" torqueLoss="5.50" />
-            <Entry retarderSpeed="1500.00" torqueLoss="5.60" />
-            <Entry retarderSpeed="1600.00" torqueLoss="5.60" />
-            <Entry retarderSpeed="1700.00" torqueLoss="5.70" />
-            <Entry retarderSpeed="1800.00" torqueLoss="5.80" />
-            <Entry retarderSpeed="1900.00" torqueLoss="5.90" />
-            <Entry retarderSpeed="2000.00" torqueLoss="6.00" />
-            <Entry retarderSpeed="2100.00" torqueLoss="6.10" />
-            <Entry retarderSpeed="2200.00" torqueLoss="6.20" />
-            <Entry retarderSpeed="2300.00" torqueLoss="6.30" />
-            <Entry retarderSpeed="2400.00" torqueLoss="6.40" />
-            <Entry retarderSpeed="2500.00" torqueLoss="6.60" />
-            <Entry retarderSpeed="2600.00" torqueLoss="6.70" />
-            <Entry retarderSpeed="2700.00" torqueLoss="6.80" />
-            <Entry retarderSpeed="2800.00" torqueLoss="7.00" />
-            <Entry retarderSpeed="2900.00" torqueLoss="7.10" />
-            <Entry retarderSpeed="3000.00" torqueLoss="7.30" />
-            <Entry retarderSpeed="3100.00" torqueLoss="7.40" />
-            <Entry retarderSpeed="3200.00" torqueLoss="7.60" />
-            <Entry retarderSpeed="3300.00" torqueLoss="7.70" />
-            <Entry retarderSpeed="3400.00" torqueLoss="7.90" />
-            <Entry retarderSpeed="3500.00" torqueLoss="8.10" />
-            <Entry retarderSpeed="3600.00" torqueLoss="8.20" />
-            <Entry retarderSpeed="3700.00" torqueLoss="8.40" />
-            <Entry retarderSpeed="3800.00" torqueLoss="8.60" />
-            <Entry retarderSpeed="3900.00" torqueLoss="8.80" />
-            <Entry retarderSpeed="4000.00" torqueLoss="9.00" />
-            <Entry retarderSpeed="4100.00" torqueLoss="9.20" />
-            <Entry retarderSpeed="4200.00" torqueLoss="9.40" />
-            <Entry retarderSpeed="4300.00" torqueLoss="9.60" />
-            <Entry retarderSpeed="4400.00" torqueLoss="9.80" />
-            <Entry retarderSpeed="4500.00" torqueLoss="10.10" />
-            <Entry retarderSpeed="4600.00" torqueLoss="10.30" />
-            <Entry retarderSpeed="4700.00" torqueLoss="10.50" />
-            <Entry retarderSpeed="4800.00" torqueLoss="10.80" />
-            <Entry retarderSpeed="4900.00" torqueLoss="11.00" />
-            <Entry retarderSpeed="5000.00" torqueLoss="11.30" />
-            <Entry retarderSpeed="5100.00" torqueLoss="11.50" />
-            <Entry retarderSpeed="5200.00" torqueLoss="11.80" />
-            <Entry retarderSpeed="5300.00" torqueLoss="12.00" />
-            <Entry retarderSpeed="5400.00" torqueLoss="12.30" />
-            <Entry retarderSpeed="5500.00" torqueLoss="12.60" />
-            <Entry retarderSpeed="5600.00" torqueLoss="12.80" />
-            <Entry retarderSpeed="5700.00" torqueLoss="13.10" />
-            <Entry retarderSpeed="5800.00" torqueLoss="13.40" />
-            <Entry retarderSpeed="5900.00" torqueLoss="13.70" />
-            <Entry retarderSpeed="6000.00" torqueLoss="14.00" />
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>RET-generic</Model>
+					<CertificationNumber>standard values</CertificationNumber>
+					<Date>2018-02-02T13:38:22.424664Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<RetarderLossMap>
+						<Entry retarderSpeed="0.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="100.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="200.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="300.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="400.00" torqueLoss="5.00"/>
+						<Entry retarderSpeed="500.00" torqueLoss="5.10"/>
+						<Entry retarderSpeed="600.00" torqueLoss="5.10"/>
+						<Entry retarderSpeed="700.00" torqueLoss="5.10"/>
+						<Entry retarderSpeed="800.00" torqueLoss="5.20"/>
+						<Entry retarderSpeed="900.00" torqueLoss="5.20"/>
+						<Entry retarderSpeed="1000.00" torqueLoss="5.30"/>
+						<Entry retarderSpeed="1100.00" torqueLoss="5.30"/>
+						<Entry retarderSpeed="1200.00" torqueLoss="5.40"/>
+						<Entry retarderSpeed="1300.00" torqueLoss="5.40"/>
+						<Entry retarderSpeed="1400.00" torqueLoss="5.50"/>
+						<Entry retarderSpeed="1500.00" torqueLoss="5.60"/>
+						<Entry retarderSpeed="1600.00" torqueLoss="5.60"/>
+						<Entry retarderSpeed="1700.00" torqueLoss="5.70"/>
+						<Entry retarderSpeed="1800.00" torqueLoss="5.80"/>
+						<Entry retarderSpeed="1900.00" torqueLoss="5.90"/>
+						<Entry retarderSpeed="2000.00" torqueLoss="6.00"/>
+						<Entry retarderSpeed="2100.00" torqueLoss="6.10"/>
+						<Entry retarderSpeed="2200.00" torqueLoss="6.20"/>
+						<Entry retarderSpeed="2300.00" torqueLoss="6.30"/>
+						<Entry retarderSpeed="2400.00" torqueLoss="6.40"/>
+						<Entry retarderSpeed="2500.00" torqueLoss="6.60"/>
+						<Entry retarderSpeed="2600.00" torqueLoss="6.70"/>
+						<Entry retarderSpeed="2700.00" torqueLoss="6.80"/>
+						<Entry retarderSpeed="2800.00" torqueLoss="7.00"/>
+						<Entry retarderSpeed="2900.00" torqueLoss="7.10"/>
+						<Entry retarderSpeed="3000.00" torqueLoss="7.30"/>
+						<Entry retarderSpeed="3100.00" torqueLoss="7.40"/>
+						<Entry retarderSpeed="3200.00" torqueLoss="7.60"/>
+						<Entry retarderSpeed="3300.00" torqueLoss="7.70"/>
+						<Entry retarderSpeed="3400.00" torqueLoss="7.90"/>
+						<Entry retarderSpeed="3500.00" torqueLoss="8.10"/>
+						<Entry retarderSpeed="3600.00" torqueLoss="8.20"/>
+						<Entry retarderSpeed="3700.00" torqueLoss="8.40"/>
+						<Entry retarderSpeed="3800.00" torqueLoss="8.60"/>
+						<Entry retarderSpeed="3900.00" torqueLoss="8.80"/>
+						<Entry retarderSpeed="4000.00" torqueLoss="9.00"/>
+						<Entry retarderSpeed="4100.00" torqueLoss="9.20"/>
+						<Entry retarderSpeed="4200.00" torqueLoss="9.40"/>
+						<Entry retarderSpeed="4300.00" torqueLoss="9.60"/>
+						<Entry retarderSpeed="4400.00" torqueLoss="9.80"/>
+						<Entry retarderSpeed="4500.00" torqueLoss="10.10"/>
+						<Entry retarderSpeed="4600.00" torqueLoss="10.30"/>
+						<Entry retarderSpeed="4700.00" torqueLoss="10.50"/>
+						<Entry retarderSpeed="4800.00" torqueLoss="10.80"/>
+						<Entry retarderSpeed="4900.00" torqueLoss="11.00"/>
+						<Entry retarderSpeed="5000.00" torqueLoss="11.30"/>
+						<Entry retarderSpeed="5100.00" torqueLoss="11.50"/>
+						<Entry retarderSpeed="5200.00" torqueLoss="11.80"/>
+						<Entry retarderSpeed="5300.00" torqueLoss="12.00"/>
+						<Entry retarderSpeed="5400.00" torqueLoss="12.30"/>
+						<Entry retarderSpeed="5500.00" torqueLoss="12.60"/>
+						<Entry retarderSpeed="5600.00" torqueLoss="12.80"/>
+						<Entry retarderSpeed="5700.00" torqueLoss="13.10"/>
+						<Entry retarderSpeed="5800.00" torqueLoss="13.40"/>
+						<Entry retarderSpeed="5900.00" torqueLoss="13.70"/>
+						<Entry retarderSpeed="6000.00" torqueLoss="14.00"/>
 					</RetarderLossMap>
 				</Data>
 				<Signature>
@@ -3055,7 +3055,6 @@
 						<Entry inputSpeed="1300.00" inputTorque="24000.00" torqueLoss="400.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="25000.00" torqueLoss="415.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="26000.00" torqueLoss="430.00"/>
-
 						<Entry inputSpeed="1300.00" inputTorque="27000.00" torqueLoss="445.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="28000.00" torqueLoss="460.00"/>
 						<Entry inputSpeed="1300.00" inputTorque="29000.00" torqueLoss="475.00"/>
@@ -3338,19 +3337,18 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>true</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml
index 263d916f17..cb2b6bd5d7 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
-		<Model>Sample Bus Model</Model>
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
-		<LegislativeClass>M3</LegislativeClass>
-		<ClassBus>II+III</ClassBus>
-		<VehicleCode>CB</VehicleCode>
-		<CurbMassChassis>19400</CurbMassChassis>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<RegisteredPassengers>
-			<LowerDeck>16</LowerDeck>
-			<UpperDeck>56</UpperDeck>
-		</RegisteredPassengers>
+		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<ClassBus>II+III</ClassBus>
+		<NumberPassengersLowerDeck>16</NumberPassengersLowerDeck>
+		<NumberPassengersUpperDeck>56</NumberPassengersUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
 		<LowEntry>true</LowEntry>
-		<HeightIntegratedBody>4.000</HeightIntegratedBody>
-		<VehicleLength>13.890</VehicleLength>
-		<VehicleWidth>2.550</VehicleWidth>
-		<EntranceHeight>0.300</EntranceHeight>
+		<HeightIntegratedBody>4000</HeightIntegratedBody>
+		<VehicleLength>13890</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>300</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
-			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
@@ -43,28 +44,26 @@
 						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 					</di:Reference>
 				</Signature>
-			</v2.6:AirDrag>
+			</v2.8:AirDrag>
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
 						<LEDLights>
+							<Interiorlights>true</Interiorlights>
 							<Dayrunninglights>true</Dayrunninglights>
-							<Headlights>true</Headlights>
 							<Positionlights>true</Positionlights>
 							<Brakelights>true</Brakelights>
-							<Interiorlights>true</Interiorlights>
+							<Headlights>true</Headlights>
 						</LEDLights>
 					</ElectricSystem>
 					<HVAC>
 						<SystemConfiguration>6</SystemConfiguration>
-						<CompressorType>
-							<DriverAC>none</DriverAC>
-							<PassengerAC>2-stage</PassengerAC>
-						</CompressorType>
+						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>N.A.</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
 						<AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
 						<DoubleGlazing>true</DoubleGlazing>
-						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
 					</HVAC>
diff --git a/Generic Vehicles/Declaration Mode/VTP HeavyBus/primary_heavyBus group P33_34_non_Smart.xml b/Generic Vehicles/Declaration Mode/VTP HeavyBus/primary_heavyBus group P33_34_non_Smart.xml
index 6191bcc6d5..97987ab1de 100644
--- a/Generic Vehicles/Declaration Mode/VTP HeavyBus/primary_heavyBus group P33_34_non_Smart.xml	
+++ b/Generic Vehicles/Declaration Mode/VTP HeavyBus/primary_heavyBus group P33_34_non_Smart.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartPS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>6x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3338,19 +3338,18 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
 						<SmartRegenerationSystem>false</SmartRegenerationSystem>
 						<AirsuspensionControl>electronically</AirsuspensionControl>
-						<AdBlueDosing>true</AdBlueDosing>
+						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
 					</PneumaticSystem>
 					<HVAC>
 						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
-- 
GitLab