diff --git a/HashingTool/Properties/Version.cs b/HashingTool/Properties/Version.cs
index 73b45c2c1c60a2d69dd9ec0353807ac421766e81..c1a685fb616fbdc4d28b21c04fcd642c018e02dd 100644
--- a/HashingTool/Properties/Version.cs
+++ b/HashingTool/Properties/Version.cs
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1133")]
-[assembly: AssemblyFileVersion("0.2.0.1133")]
+[assembly: AssemblyVersion("0.2.0.1250")]
+[assembly: AssemblyFileVersion("0.2.0.1250")]
diff --git a/VectoCommon/VectoCommon/Properties/Version.cs b/VectoCommon/VectoCommon/Properties/Version.cs
index e439021ada7de912554531de13ec82eda6c4564b..19ad6af946ae6becb21b3105d2fde0531adbed04 100644
--- a/VectoCommon/VectoCommon/Properties/Version.cs
+++ b/VectoCommon/VectoCommon/Properties/Version.cs
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.2.1.1133")]
-[assembly: AssemblyFileVersion("3.2.1.1133")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.0.1250")]
+[assembly: AssemblyFileVersion("3.3.0.1250")]
\ No newline at end of file
diff --git a/VectoCommon/VectoHashing/Properties/Version.cs b/VectoCommon/VectoHashing/Properties/Version.cs
index a3e81eb57441c90f6131874290219289328e6c4b..10c9c5e1ec7156b0c4e9ead1b57ad479e7f428d7 100644
--- a/VectoCommon/VectoHashing/Properties/Version.cs
+++ b/VectoCommon/VectoHashing/Properties/Version.cs
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1133")]
-[assembly: AssemblyFileVersion("1.2.0.1133")]
+[assembly: AssemblyVersion("1.2.0.1250")]
+[assembly: AssemblyFileVersion("1.2.0.1250")]
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 33ca99df0f4ec4a77e5eee733d498194ad6048f3..427b0448327fca069e38955082176d3091f92572 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.2.1.1133")]
-[assembly: AssemblyFileVersion("3.2.1.1133")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.3.0.1250")]
+[assembly: AssemblyFileVersion("3.3.0.1250")]
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index 7e94075668471c23ac6b1a84f96417283a3ed51b..875fea7840a24998d4e328986502ff4cc0f501b4 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.2.1.1133")]
-[assembly: AssemblyFileVersion("3.2.1.1133")]
+[assembly: AssemblyVersion("3.3.0.1250")]
+[assembly: AssemblyFileVersion("3.3.0.1250")]
diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.cs b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
index 4d6a9619af5a0a663b0e675a83ba5e7bc08e6511..9435e8f935a3c3d20524b9b40ce9615b6b00815c 100644
--- a/VectoCore/VectoCore/Utils/VectoVersionCore.cs
+++ b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
@@ -36,7 +36,7 @@ namespace TUGraz.VectoCore.Utils
 		public static string VersionNumber
 		{
 			get {
-				return "3.2.1.1133";
+				return "3.3.0.1250";
 			}
 		}
 
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
deleted file mode 100644
index 5cfadf7b3beab36b058c4a05a498e8d150b1c302..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TUGraz.VectoCore</RootNamespace>
-    <AssemblyName>VectoCore</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
-    <NuGetPackageImportStamp>5f3566e7</NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
-    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
-    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
-    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
-    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
-    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
-    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
-    <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
-    <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
-    <CodeContractsArithmeticObligations>True</CodeContractsArithmeticObligations>
-    <CodeContractsEnumObligations>True</CodeContractsEnumObligations>
-    <CodeContractsRedundantAssumptions>True</CodeContractsRedundantAssumptions>
-    <CodeContractsAssertsToContractsCheckBox>False</CodeContractsAssertsToContractsCheckBox>
-    <CodeContractsRedundantTests>True</CodeContractsRedundantTests>
-    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
-    <CodeContractsMissingPublicEnsuresAsWarnings>True</CodeContractsMissingPublicEnsuresAsWarnings>
-    <CodeContractsInferRequires>True</CodeContractsInferRequires>
-    <CodeContractsInferEnsures>True</CodeContractsInferEnsures>
-    <CodeContractsInferEnsuresAutoProperties>True</CodeContractsInferEnsuresAutoProperties>
-    <CodeContractsInferObjectInvariants>True</CodeContractsInferObjectInvariants>
-    <CodeContractsSuggestAssumptions>True</CodeContractsSuggestAssumptions>
-    <CodeContractsSuggestAssumptionsForCallees>False</CodeContractsSuggestAssumptionsForCallees>
-    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
-    <CodeContractsNecessaryEnsures>False</CodeContractsNecessaryEnsures>
-    <CodeContractsSuggestObjectInvariants>True</CodeContractsSuggestObjectInvariants>
-    <CodeContractsSuggestReadonly>False</CodeContractsSuggestReadonly>
-    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
-    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
-    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
-    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
-    <CodeContractsCustomRewriterAssembly />
-    <CodeContractsCustomRewriterClass />
-    <CodeContractsLibPaths />
-    <CodeContractsExtraRewriteOptions />
-    <CodeContractsExtraAnalysisOptions />
-    <CodeContractsSQLServerOption />
-    <CodeContractsBaseLineFile>baseline.xml</CodeContractsBaseLineFile>
-    <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
-    <CodeContractsSkipAnalysisIfCannotConnectToCache>False</CodeContractsSkipAnalysisIfCannotConnectToCache>
-    <CodeContractsFailBuildOnWarnings>True</CodeContractsFailBuildOnWarnings>
-    <CodeContractsBeingOptimisticOnExternal>True</CodeContractsBeingOptimisticOnExternal>
-    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
-    <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
-    <CodeContractsAnalysisWarningLevel>3</CodeContractsAnalysisWarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog">
-      <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Configuration\Constants.cs" />
-    <Compile Include="InputData\AuxiliaryFileHelper.cs" />
-    <Compile Include="InputData\FileIO\JSON\IJSONVehicleComponents.cs" />
-    <Compile Include="InputData\FileIO\JSON\JSONComponentInputData.cs" />
-    <Compile Include="InputData\FileIO\JSON\JsonExtensionMethods.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\AbstractDeclarationXMLComponentDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAirdragDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAngledriveDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAuxiliaryDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationAxlegearDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationEngineDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationGearboxDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationJobInputDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationRetarderDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationTorqueConverterDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationVehicleDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLDeclarationInputDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Declaration\XMLManufacturerReportReader.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\AbstractEngineeringXMLComponentDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAirdragDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAngledriveDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAuxiliaryDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringAxlegearDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringDriverDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringEngineDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringGearboxDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringInputDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringJobInputDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringRetarderDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringTorqueConverterDataProvider.cs" />
-    <Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringVehicleDataProvider.cs" />
-    <Compile Include="InputData\FileIO\JSON\JSONEngineData.cs" />
-    <Compile Include="InputData\FileIO\JSON\JSONGearboxData.cs" />
-    <Compile Include="InputData\FileIO\JSON\JSONInputData.cs" />
-    <Compile Include="InputData\FileIO\JSON\JSONInputDataFactory.cs" />
-    <Compile Include="InputData\FileIO\JSON\JSONVehicleData.cs" />
-    <Compile Include="InputData\Impl\InputData.cs" />
-    <Compile Include="InputData\IVectoRunDataFactory.cs" />
-    <Compile Include="InputData\Reader\ComponentData\AccelerationCurveReader.cs" />
-    <Compile Include="InputData\Reader\ComponentData\AuxiliaryDataReader.cs" />
-    <Compile Include="InputData\Reader\ComponentData\CrossWindCorrectionCurveReader.cs" />
-    <Compile Include="InputData\Reader\ComponentData\PTOIdleLossMapReader.cs" />
-    <Compile Include="InputData\Reader\ComponentData\RetarderLossMapReader.cs" />
-    <Compile Include="InputData\Reader\ComponentData\TorqueConverterDataReader.cs" />
-    <Compile Include="InputData\Reader\ComponentData\TransmissionLossMapReader.cs" />
-    <Compile Include="InputData\Reader\DataObjectAdapter\AbstractSimulationDataAdapter.cs" />
-    <Compile Include="InputData\Reader\DataObjectAdapter\DeclarationDataAdapter.cs" />
-    <Compile Include="InputData\Reader\DataObjectAdapter\EngineeringDataAdapter.cs" />
-    <Compile Include="InputData\Reader\DrivingCycleDataReader.cs" />
-    <Compile Include="InputData\Reader\FullLoadCurveReader.cs" />
-    <Compile Include="InputData\Reader\Impl\DeclarationModeVectoRunDataFactory.cs" />
-    <Compile Include="InputData\Reader\Impl\DeclarationVTPModeVectoRunDataFactory.cs" />
-    <Compile Include="InputData\Reader\Impl\DrivingCycleProxy.cs" />
-    <Compile Include="InputData\Reader\Impl\EngineeringModeVectoRunDataFactory.cs" />
-    <Compile Include="InputData\Reader\Impl\EngineOnlyVectoRunDataFactory.cs" />
-    <Compile Include="InputData\Reader\ShiftPolygonReader.cs" />
-    <Compile Include="Models\Declaration\AuxDemandEntry.cs" />
-    <Compile Include="Models\Declaration\AuxiliaryTypeHelper.cs" />
-    <Compile Include="Models\Connector\Ports\IDriverDemandPort.cs" />
-    <Compile Include="Models\Connector\Ports\IDrivingCyclePort.cs" />
-    <Compile Include="Models\Connector\Ports\Impl\Response.cs" />
-    <Compile Include="Models\Connector\Ports\IFvPort.cs" />
-    <Compile Include="Models\Connector\Ports\ITnPort.cs" />
-    <Compile Include="Models\Declaration\FuelData.cs" />
-    <Compile Include="Models\Declaration\PTOTransmission.cs" />
-    <Compile Include="Models\Declaration\IDeclarationAuxiliaryTable.cs" />
-    <Compile Include="Models\SimulationComponent\Data\AngledriveData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMapReader.cs" />
-    <Compile Include="Models\SimulationComponent\Data\PTOData.cs" />
-    <Compile Include="Models\SimulationComponent\ILossMap.cs" />
-    <Compile Include="Models\SimulationComponent\Data\PTOLossMap.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\AbstractGearbox.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\ATGearbox.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\ATShiftStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\BaseShiftStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\DrivingCycleEnumerator.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\EngineFanAuxiliary.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\VTPCombustionEngine.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\MeasuredSpeedDrivingCycle.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\PTOCycleController.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\PWheelCycle.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\TorqueConverter.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\IdleControllerSwitcher.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\VTPGearbox.cs" />
-    <Compile Include="Models\Simulation\Data\ModalResultField.cs" />
-    <Compile Include="InputData\Reader\Impl\EngineeringVTPModeVectoRunDataFactory.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\VTPCycle.cs" />
-    <Compile Include="Utils\XMLHelper.cs" />
-    <Compile Include="OutputData\XML\XMLVTPReport.cs" />
-    <Compile Include="OutputData\VTPReport.cs" />
-    <Compile Include="OutputData\ModFilter\ActualModalDataFilter.cs" />
-    <Compile Include="OutputData\ModFilter\ModalData1HzFilter.cs" />
-    <Compile Include="OutputData\XML\AbstractXMLWriter.cs" />
-    <Compile Include="OutputData\XML\AttributeMappings.cs" />
-    <Compile Include="OutputData\XML\XMLCustomerReport.cs" />
-    <Compile Include="OutputData\XML\XMLDeclarationReport.cs" />
-    <Compile Include="OutputData\XML\XMLDeclarationWriter.cs" />
-    <Compile Include="OutputData\XML\XMLEngineeringWriter.cs" />
-    <Compile Include="OutputData\XML\XMLManufacturerReport.cs" />
-    <Compile Include="Utils\ProviderExtensions.cs" />
-    <Compile Include="Models\Declaration\AirDrag.cs" />
-    <Compile Include="Models\Declaration\Fan.cs" />
-    <Compile Include="Models\Declaration\HVAC.cs" />
-    <Compile Include="Models\Declaration\LACDecisionFactor.cs" />
-    <Compile Include="Models\Declaration\Payloads.cs" />
-    <Compile Include="Models\Declaration\PneumaticSystem.cs" />
-    <Compile Include="Models\Declaration\PT1.cs" />
-    <Compile Include="Models\Declaration\Segments.cs" />
-    <Compile Include="Models\Declaration\StandardBodies.cs" />
-    <Compile Include="Models\Declaration\SteeringPump.cs" />
-    <Compile Include="Models\Declaration\VehicleClass.cs" />
-    <Compile Include="Models\Declaration\Wheels.cs" />
-    <Compile Include="Models\Declaration\WHTCCorrection.cs" />
-    <Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionCdxALookup.cs" />
-    <Compile Include="Models\SimulationComponent\Data\AuxiliaryData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\AuxSupplyPowerReader.cs" />
-    <Compile Include="Models\SimulationComponent\Data\AxleGearData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\CycleData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\AccelerationCurve.cs" />
-    <Compile Include="Models\Declaration\DeclarationData.cs" />
-    <Compile Include="Models\Declaration\ElectricSystem.cs" />
-    <Compile Include="Models\Declaration\LookupData.cs" />
-    <Compile Include="Models\Declaration\Mission.cs" />
-    <Compile Include="Models\Declaration\MissionType.cs" />
-    <Compile Include="Models\SimulationComponent\Data\DriverData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\ICrossWindCorrection.cs" />
-    <Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionVAirBeta.cs" />
-    <Compile Include="Models\SimulationComponent\IAxlegear.cs" />
-    <Compile Include="Models\SimulationComponent\IBrakes.cs" />
-    <Compile Include="Models\SimulationComponent\IIdleController.cs" />
-    <Compile Include="Models\SimulationComponent\IDriverActions.cs" />
-    <Compile Include="Models\SimulationComponent\IDriverStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\IDrivingCycleInfo.cs" />
-    <Compile Include="Models\SimulationComponent\IAuxPort.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\AMTShiftStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Angledrive.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Brakes.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\BusAuxiliariesAdapter.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\CycleGearbox.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\DefaultDriverStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\DummyRetarder.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\EngineAuxiliary.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\EngineOnlyCombustionEngine.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\MTShiftStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\TransmissionComponent.cs" />
-    <Compile Include="Models\SimulationComponent\IShiftStrategy.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\ShiftStrategy.cs" />
-    <Compile Include="Models\Simulation\DataBus\IAxlegearInfo.cs" />
-    <Compile Include="Models\Simulation\DataBus\IClutchInfo.cs" />
-    <Compile Include="Models\Simulation\DataBus\IDriverInfo.cs" />
-    <Compile Include="Models\Simulation\DataBus\IWheelsInfo.cs" />
-    <Compile Include="Models\Simulation\DataBus\IMileageCounter.cs" />
-    <Compile Include="Utils\DebugData.cs" />
-    <Compile Include="Models\Simulation\Impl\DistanceRun.cs" />
-    <Compile Include="Models\Simulation\Impl\PowertrainBuilder.cs" />
-    <Compile Include="Models\Simulation\Impl\TimeRun.cs" />
-    <Compile Include="OutputData\DeclarationReport.cs" />
-    <Compile Include="OutputData\FileIO\FileOutputWriter.cs" />
-    <Compile Include="OutputData\IModalDataContainer.cs" />
-    <Compile Include="OutputData\IDataWriter.cs" />
-    <Compile Include="OutputData\ModalDataContainer.cs" />
-    <Compile Include="OutputData\SummaryDataContainer.cs" />
-    <Compile Include="Properties\Version.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Version.tt</DependentUpon>
-    </Compile>
-    <Compile Include="JsonKeys.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>JsonKeys.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Utils\DataTableExtensionMethods.cs" />
-    <Compile Include="Utils\DateTimeFallbackDeserializer.cs" />
-    <Compile Include="Utils\DictionaryExtensionMethods.cs" />
-    <Compile Include="Utils\IterationStatistics.cs" />
-    <Compile Include="Utils\RessourceHelper.cs" />
-    <Compile Include="Models\Declaration\Segment.cs" />
-    <Compile Include="Models\Declaration\Axle.cs" />
-    <Compile Include="Models\SimulationComponent\Data\CombustionEngineData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\DrivingCycleData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMap.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Engine\EngineFullLoadCurve.cs" />
-    <Compile Include="Models\SimulationComponent\Data\GearboxData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Gearbox\GearData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Gearbox\TransmissionLossMap.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Gearbox\ShiftPolygon.cs" />
-    <Compile Include="Models\SimulationComponent\Data\Gearbox\TorqueConverterData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\RetarderData.cs" />
-    <Compile Include="Models\SimulationComponent\Data\RetarderLossMap.cs" />
-    <Compile Include="Models\SimulationComponent\Data\VehicleData.cs" />
-    <Compile Include="Models\SimulationComponent\IClutch.cs" />
-    <Compile Include="Models\SimulationComponent\IDrivingCycle.cs" />
-    <Compile Include="Models\SimulationComponent\IDriver.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Vehicle.cs" />
-    <Compile Include="Models\SimulationComponent\IVehicle.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Clutch.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\AxleGear.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Retarder.cs" />
-    <Compile Include="Models\SimulationComponent\IPowerTrainComponent.cs" />
-    <Compile Include="Models\Simulation\Data\VectoRunData.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Driver.cs" />
-    <Compile Include="Utils\Formulas.cs" />
-    <Compile Include="Utils\Physics.cs" />
-    <Compile Include="Utils\SearchAlgorithm.cs" />
-    <Compile Include="Models\SimulationComponent\Data\SimulationComponentData.cs" />
-    <Compile Include="Models\SimulationComponent\ICombustionEngine.cs" />
-    <Compile Include="Models\SimulationComponent\IGearbox.cs" />
-    <Compile Include="Models\Connector\Ports\ISimulationPort.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\DistanceBasedDrivingCycle.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\CombustionEngine.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Gearbox.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\Wheels.cs" />
-    <Compile Include="Models\SimulationComponent\IWheels.cs" />
-    <Compile Include="Models\SimulationComponent\VectoSimulationComponent.cs" />
-    <Compile Include="Models\SimulationComponent\Impl\PowertrainDrivingCycle.cs" />
-    <Compile Include="Models\Simulation\Data\ModalResult.cs" />
-    <Compile Include="Models\Simulation\IVectoRun.cs" />
-    <Compile Include="Models\Simulation\Impl\SimulatorFactory.cs" />
-    <Compile Include="Models\Simulation\Impl\VectoRun.cs" />
-    <Compile Include="Models\Simulation\Impl\JobContainer.cs" />
-    <Compile Include="Models\Simulation\Impl\VehicleContainer.cs" />
-    <Compile Include="Models\Simulation\DataBus\IDataBus.cs" />
-    <Compile Include="Models\Simulation\DataBus\IEngineInfo.cs" />
-    <Compile Include="Models\Simulation\DataBus\IGearboxInfo.cs" />
-    <Compile Include="Models\Simulation\DataBus\IVehicleInfo.cs" />
-    <Compile Include="Models\Simulation\IVehicleContainer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="OutputData\FileIO\ShiftPolygonExport.cs" />
-    <Compile Include="Utils\SwitchExtension.cs" />
-    <Compile Include="Utils\VectoCSVFile.cs" />
-    <Compile Include="Utils\DelaunayMap.cs" />
-    <Compile Include="Utils\VectoVersionCore.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>VectoVersionCore.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Utils\XmlResourceResolver.cs" />
-    <Compile Include="Utils\XMLValidator.cs" />
-    <Compile Include="Utils\XPathHelper.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-    <EmbeddedResource Include="JsonKeys.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>JsonKeys.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Declaration\Wheels.csv" />
-    <EmbeddedResource Include="Resources\Declaration\SegmentTable.csv" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\HeavyUrban.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\Suburban.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\Urban.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\Coach.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\Construction.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\Interurban.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\LongHaul.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\RegionalDelivery.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\UrbanDelivery.vdri" />
-    <EmbeddedResource Include="Resources\Declaration\PT1.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VACC\Truck.vacc" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\ES-Tech.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\Fan-Tech.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\HVAC-Table.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\PS-Table.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Table.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Tech.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VCDV\VCDV_parameters.csv" />
-    <EmbeddedResource Include="Resources\Declaration\WHTC-Weighting-Factors.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\ALT-Tech.csv" />
-    <EmbeddedResource Include="Resources\Declaration\Report\cyclePageTemplate.pdf" />
-    <EmbeddedResource Include="Resources\Declaration\Report\title2CyclesTemplate.pdf" />
-    <EmbeddedResource Include="Resources\Declaration\Report\title3CyclesTemplate.pdf" />
-    <None Include="Properties\Version.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Version.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="Resources\Declaration\LAC-DF-Vdrop.csv" />
-    <EmbeddedResource Include="Resources\Declaration\LAC-DF-Vtarget.csv" />
-    <EmbeddedResource Include="Resources\Declaration\Body_Trailers_Weights.csv" />
-    <EmbeddedResource Include="Resources\Declaration\Payloads.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\SP-Axles.csv" />
-    <EmbeddedResource Include="Resources\Declaration\VAUX\PTO-tech.csv" />
-    <EmbeddedResource Include="Resources\Declaration\TorqueConverter.csv" />
-    <EmbeddedResource Include="Resources\XSD\ParameterDocumentation.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoComponent.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoEngineeringDefinitions.0.6.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoEngineeringDefinitions.0.7.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoEngineeringInput.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoInput.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\xmldsig-core-schema.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility_PTO_generic.vptoc" />
-    <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility_PTO_generic.vptol" />
-    <EmbeddedResource Include="Resources\Declaration\FuelTypes.csv" />
-    <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.1.0.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoInput.1.0.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.0.4.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.4.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoEngineeringInput.0.7.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoComponent.1.0.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.0.5.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoOutputCustomer.0.5.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="Utils\VectoVersionCore.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>VectoVersionCore.cs</LastGenOutput>
-    </None>
-    <None Include="VersionNumber.t4">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>VersionNumber1.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Declaration\Report\4x2r.png" />
-    <EmbeddedResource Include="Resources\Declaration\Report\4x2rt.png" />
-    <EmbeddedResource Include="Resources\Declaration\Report\4x2tt.png" />
-    <EmbeddedResource Include="Resources\Declaration\Report\6x2r.png" />
-    <EmbeddedResource Include="Resources\Declaration\Report\6x2rt.png" />
-    <EmbeddedResource Include="Resources\Declaration\Report\6x2tt.png" />
-    <EmbeddedResource Include="Resources\Declaration\Report\Undef.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
-      <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
-      <Name>AdvancedAuxiliaryInterfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
-      <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
-      <Name>VectoAuxiliaries</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
-      <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
-      <Name>VectoCommon</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\VectoCommon\VectoHashing\VectoHashing.csproj">
-      <Project>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</Project>
-      <Name>VectoHashing</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
-</Project>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4
index c2a37907d6ca63b1214c55dcda6aa212459e0e25..78d4e8ed1d7eb99bf028d07419c2b15a65db101d 100644
--- a/VectoCore/VectoCore/VersionNumber.t4
+++ b/VectoCore/VectoCore/VersionNumber.t4
@@ -6,6 +6,6 @@ int GetBuildNumber()
 
 string GetVectoCoreVersionNumber()
 {
-	return "3.2.1." + GetBuildNumber();
+	return "3.3.0." + GetBuildNumber();
 }
 #>
\ No newline at end of file