diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto b/Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto
index 9ef97349011f4d7350773186534c240964319d78..8f0b059224c23b0a3e8c9b89211b67e63f60bbab 100644
--- a/Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto	
+++ b/Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto	
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_31b.xml",
-		"PrimaryVehicleResults":  "primary_heavyBus group_P31_32_Smart_ES.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "primary_heavyBus group_P31_32_Smart_ES.PIF.xml"
 	}
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml b/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca639ef812380b3c9e3ae469c591ca67be9009d3
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml	
@@ -0,0 +1,526 @@
+<?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>
+        <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.39581</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1421.75</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.48056</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1721.17</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.90915</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1166.17</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.25350</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1411.32</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.61881</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1071.59</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.74669</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1300.87</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">19.82851</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1453.47</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.12659</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1768.53</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.37265</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1200.15</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">19.89387</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1458.26</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">15.18680</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1113.22</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.46135</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1353.26</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">13.39119</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">981.60</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P32SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
+          <Payload unit="kg">4301.75</Payload>
+          <PassengerCount>60.59</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">15.14041</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1109.82</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.91114</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">873.11</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">12.33438</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">904.14</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.79159</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1010.95</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P32DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
+          <Payload unit="kg">5051.30</Payload>
+          <PassengerCount>71.15</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">15.77755</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1156.53</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">12.42999</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">911.14</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.91402</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">946.63</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
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/CompletedBus_34f.vecto b/Generic Vehicles/Declaration Mode/CompletedBus 34f/CompletedBus_34f.vecto
index 178ee1d11a086361753f470edc52de51e7b6ba0f..806bdc989383c55949d82be7dc4a94e192d59512 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/CompletedBus_34f.vecto	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/CompletedBus_34f.vecto	
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_34f.xml",
-		"PrimaryVehicleResults":  "primary_heavyBus group_P33_34_SmartPS.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "primary_heavyBus group_P33_34_SmartPS.PIF.xml"
 	}
 }
\ No newline at end of file
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
new file mode 100644
index 0000000000000000000000000000000000000000..e3297b102fa69f17d84177abea8af770d2093aff
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml	
@@ -0,0 +1,575 @@
+<?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-a05132b257084f40aaea">
+    <Vehicle xsi:type="VehiclePIFType">
+      <ManufacturerPrimaryVehicle>Generic Truck 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>0BZN5PRA+yNbRtyLAPI/77M0iruHuhaFcTOZnPxKfHU=</di:DigestValue>
+      </di:Reference>
+    </InputDataSignature>
+    <ManufacturerRecordSignature>
+      <di:Reference URI="#RESULT-3a8e8386f57c42c1a157">
+        <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>sLB3B7Y2jzBFA1PR6n/xV+rsz77UGsbY23o0IGGX2Ng=</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">22.09062</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1619.29</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">26.42283</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1936.85</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">17.40227</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1275.62</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">21.00254</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1539.53</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.97840</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1097.95</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">18.29954</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1341.39</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.84600</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1674.66</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.81260</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2038.72</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">18.08030</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1325.32</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.18081</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1625.90</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.62208</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1145.13</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.48708</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1428.44</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">12.55465</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">920.28</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">20231.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">14.40400</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1055.84</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">9.47946</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">694.86</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.96360</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">730.35</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">14.19300</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1040.38</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">24802.32</TotalVehicleMass>
+          <Payload unit="kg">6952.32</Payload>
+          <PassengerCount>97.92</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.70781</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1224.72</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">10.63725</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">779.73</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">11.34633</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">831.71</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.1.1954-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-05-11T09:15:28.1347345Z</Date>
+    </ApplicationInformation>
+  </pif:Data>
+  <pif:Signature>
+    <di:Reference URI="#PIF-a05132b257084f40aaea">
+      <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>6Mg8/kouOaJSejUIYlsWCjr183cZAHK9iaFbNbG9q9U=</di:DigestValue>
+    </di:Reference>
+  </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file