diff --git a/User Manual/5-input-and-output-files/VDRI.md b/User Manual/5-input-and-output-files/VDRI.md
index 384863a758f6e0603a93c99c5ee0df0b9c471511..cf591f4e78807082ad5e6eac0a49979edc7451c5 100644
--- a/User Manual/5-input-and-output-files/VDRI.md
+++ b/User Manual/5-input-and-output-files/VDRI.md
@@ -1,133 +1,160 @@
##Driving Cycle (.vdri)
-The Driving Cycle defines vehicle speed, road gradient and other parameters for a test route. It is either time-based or distance-based and defines a simulated route the vehicle should be tested with.
-The format is [Vecto-CSV](#csv-format) and the columns depend on the cycle type:
+The Driving Cycle defines the parameters of a simulated route in Vecto. It is either time-based or distance-based and has different fields depending on the driving cycle type.
+The basic file format is [Vecto-CSV](#csv-format). A Job must have at least one driving cycle (except in Declaration mode, where the driving cycles are predefined).
-- **Declaration Mode**: [Target speed, time-based, predefined!](#declaration-mode-cycle)
+###Driving Cycle Types
+- **Declaration Mode**: [Target speed, distance-based](#declaration-mode-cycles)
- **Engineering Mode**:
- - [Target speed, distance-based](#distance-based-cycle)
- - [Measured speed, time-based](#measured-speed-cycle-without-gear)
- - [Measured speed with gear, time-based](#measured-speed-cycle-with-gear-and-engine-speed)
- - [Pwheel (SiCo) Mode, time-based](#pwheel-sico-mode-cycle)
-- **Engine Only Mode**: [Engine Only Mode, time-based](#engine-only-mode-cycle)
-
-**Important Notes:**
+ - [Target speed, distance-based](#engineering-mode-target-speed-distance-based-cycle)
+ - [Measured speed, time-based](#engineering-mode-measured-speed-time-based-cycle)
+ - [Measured speed with gear, time-based](#engineering-mode-measured-speed-with-gear-time-based-cycle)
+ - [Pwheel (SiCo) Mode, time-based](#engineering-mode-pwheel-sico-time-based)
+- **Engine Only Mode**: [Engine Only Mode, time-based](#engine-only-mode-engine-only-driving-cycle)
+<div class="vecto2">
- Distance-based cycles must have at least a resolution of 1[m].
-- Time-based cycles can be defined in any given time resolution, including variable time steps. If the time column ("\<t\>") is missing, the data will be interpreted to have a 1[s] resolution.
-
-###Declaration Mode Cycle
-Cycles are always distance-based and are predefined default cycles depending on vehicle category. They represent a typical usage cycle of the corresponding vehicle category. Depending on the vehicle category, up two 3 different cycles could be chosen for a simulation.
-
-- Long Haul - 100km
-- Regional Delivery - 26km
-- Urban Delivery - 28km
-- Coach - 275km
-- Urban - 40km
-- Sub Urban - 23km
-- Inter Urban - 123km
-- Heavy Urban - 30km
-- Municipal Utility - 10km
-- Construction - 21km
-
-
-###Engineering Mode Driving Cycles
-Cycles can be defined in [Job](#job-editor). A job is time based if the column \<t\> is defined. A job is distance based if the column \<s\> is defined. If both are defined, the time column is prefered (=> time-based). If none are defined, the entries will be interpreted with 1Hz (=> time-based).
-
-####Distance-Based Cycle
-
-Header: **\<s\>**,**\<v\>**,*[\<grad\>]*,**\<stop\>**,**\<Padd\>** *[,\<vair\_res\>,\<vair\_beta\>\]\[,\<Aux\_xxx\>\]*
-
-| Identifier | Quantity | Unit | Description
-| ---------- | -------- | ------ | ------------------------------------------------
-| **\<s\>** | Distance | [m] | Travelled distance.
-| **\<v\>** | Vehicle Speed | [km/h] | The target vehicle velocity.
-| *\<grad\>* | Road Gradient | [%] | Optional.
-| **\<stop\>** | Stopping Time | [s] | Required for distance-based cycles. Not used in time based cycles. \<stop\> defines the time the vehicle spends in stop phases.
-| **\<Padd\>** | Additional Aux Power Demand | [kW] | This power input will be directly added to the engine power in addition to possible other auxiliaries..
-| *\<vair_res\>* | Air speed relative to vehicle | [km/h] | Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**.
-| *\<vair_beta\>* | Wind Yaw Angle | [°] | Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**.
-| *\<Aux_xxx\>* | Auxiliary Supply Power | [kW] | Supply Power input for each auxiliary defined in the [.vecto file](#job-editor) where xxx matches the ID of the corresponding [Auxiliary](#auxiliary-dialog). ID's are not case sensitive and must not contain space or special characters.
-
-**\<bold\>** identifiers are required, *\<italic\>* are optional.
+- Time-based cycles must have exactly a resolution of 1[s].
+</div>
+
+<div class="vecto3">
+- Distance-based cycles can be defined in any distance resolution, including variable distance steps.
+- Time-based cycles can be defined in any time resolution, including variable time steps.
+</div>
+
+###Declaration Mode Cycles
+In Declaration Mode driving cycles are automatically chosen depending on vehicle category and cannot be changed by the user. These predefined cycles are of type target-speed, distance-based.
+
+- Coach: 275km
+- Construction: 21km
+- Heavy Urban: 30km
+- Inter Urban: 123km
+- Long Haul: 100km
+- Municipal Utility: 10km
+- Regional Delivery: 26km
+- Sub Urban: 23km
+- Urban: 40km
+- Urban Delivery: 28km
+
+###Engineering Mode: Target-Speed, Distance-Based Cycle
+This driving cycle defines the target speed over distance. Vecto tries to achieve and maintain this target speed.
+
+Header: **\<s>, \<v>, \<stop>***\[, \<Padd>]\[, \<grad>]\[, \<vair\_res>, \<vair\_beta>]\[, \<Aux\_ID>]*
+
+| Identifier | Unit | Description |
+| ----------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **s** | [m] | Traveled distance. Must always be increasing. |
+| **v** | [km/h] | The target vehicle velocity. Must be >= 0 km/h. |
+| **stop** | [s] | Stopping Time. Defines the time span the vehicle is standing still (time the vehicle spending in a stop phase). After this time, the vehicle tries to accelerate to \<v>. |
+| *Padd* | [kW] | Additional auxiliary power demand. This power demand will be directly added to the engine power in addition to possible other auxiliaries. Must be >= 0 kW. |
+| *grad* | [%] | The road gradient. |
+| *vair_res* | [km/h] | Air speed relative to vehicle for cross wind correction. Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**. |
+| *vair_beta* | [°] | Wind Yaw Angle for cross wind correction. Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**. |
+| *Aux_ID* | [kW] | Auxiliary Supply Power. Can be defined multiple times with different Identifiers. The supply power input for each auxiliary defined in the [.vecto file](#job-editor) with the corresponding ID. ID's are not case sensitive and must only contain letters and numbers [a-z,A-Z,0-9]. Must be >= 0 kW. |
**Example:**
-|\<s\>|\<v\>|\<grad\>|\<stop\>|\<Aux_Alt\>|\<Aux_Demo\>
-| - | - | ---- | ---- | ------- | ---------
-| 0 | 60 | 2.95016969 | 0 | 0.5 | 4.752
-| 1 | 60 | 2.95016969 | 0 | 0.5 | 4.752
-| 2 | 60 | 2.95016969 | 0 | 0.5 | 4.752
-| 3 | 60 | 2.95016969 | 0 | 0.5 | 4.752
+| \<s> [m] | \<v> [km/h] | \<stop> [s] | \<grad> [%] | \<Padd> [kW] |
+| -------- | ----------- | ----------- | ----------- | ------------ |
+| 0 | 10 | 10 | 2.95 | 1.5 |
+| 1 | 20 | 0 | 2.97 | 1.3 |
+| 2 | 35 | 0 | 3.03 | 1.3 |
+| 3 | 50 | 0 | 2.99 | 1.3 |
+
+###Engineering Mode: Measured-Speed, Time-Based Cycle
+This driving cycle defines the actual measured speed over time. Vecto tries to simulate the vehicle model using this speed as the actual vehicle speed.
+Due to differences in the real and simulated shift strategies a short difference in speed could occur, but Vecto immediately tries to catch up after the gear is engaged again.
+
+Header: **\<t>, \<v>***\[, \<grad>]\[, \<Padd>]\[, \<vair\_res>, \<vair\_beta>\]\[, \<Aux\_ID>]*
+
+| Identifier | Unit | Description |
+| ----------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **t** | [s] | The absolute time. Must always be increasing. |
+| **v** | [km/h] | The actual velocity of the vehicle. Must be >= 0 km/h. |
+| *Padd* | [kW] | Additional auxiliary power demand. This power demand will be directly added to the engine power in addition to possible other auxiliaries. Must be >= 0 kW. |
+| *grad* | [%] | The road gradient. |
+| *vair_res* | [km/h] | Air speed relative to vehicle for cross wind correction. Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**. |
+| *vair_beta* | [°] | Wind Yaw Angle for cross wind correction. Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**. |
+| *Aux_ID* | [kW] | Auxiliary Supply Power. Can be defined multiple times with different Identifiers. The supply power input for each auxiliary defined in the [.vecto file](#job-editor) with the corresponding ID. ID's are not case sensitive and must only contain letters and numbers [a-z,A-Z,0-9]. Must be >= 0 kW. |
+**Example:**
+| \<t> [m] | \<v> [km/h] | \<grad> [%] | \<Padd> [kW] |
+| -------- | ----------- | ----------- | ------------ |
+| 0 | 0 | 2.95 | 1.5 |
+| 1 | 0.6 | 2.97 | 1.3 |
+| 2 | 1.2 | 3.03 | 1.3 |
+| 3 | 2.4 | 2.99 | 1.3 |
-###Engineering Mode: Measured Speed
-
-####Measured Speed Cycle Without Gear
-This cycle type defines the measured vehicle velocity and the road gradient. It uses the built-in shift strategy of vecto to determine the current gear and the resulting engine power. If the cross wind correction for the [Vehicle](#vehicle-editor) is set to "Vair & Beta" the columns <vair_res> and <vair_beta> are required.
-
-Header: **\<t\>,\<v\>,\<grad\>,\<Padd\>** *\[,\<vair\_res\>,\<vair\_beta\>\]\[,\<Aux\_xxx\>\]*
-
-| Identifier | Quantity | Unit | Description
-| ---------- | -------- | ------ | ------------------------------------------------
-| **\<t\>** | Time | [s] | The absolute time.
-| **\<v\>** | Vehicle Speed | [km/h] | The actual velocity of the vehicle.
-| **\<grad\>** | Road Gradient | [%] | The road gradient.
-| **\<Padd\>** | Additional Aux Power Demand | [kW] | This power input will be directly added to the engine power.
-| *\<vair_res\>* | Air speed relative to vehicle | [km/h] | Only required if [Cross Wind Correction](#cross-wind-correction) in [Vehicle](#vehicle-editor) is set to **Vair & Beta Input**.
-| *\<vair_beta\>* | Wind Yaw Angle | [°] | Only required if [Cross Wind Correction](#cross-wind-correction) in [Vehicle](#vehicle-editor) is set to **Vair & Beta Input**.
-| *\<Aux\_xxx\>* | Auxiliary Supply Power | [kW] | Power input for each auxiliary defined in the [.vecto file](#job-editor) where "xxx" matches the ID of the corresponding [Auxiliary](#auxiliary-dialog). ID's are not case sensitive and may consist of word-characters only (A-Z, a-z, 0-9).
-
-**\<bold\>** identifiers are required, *\<italic\>* are optional.
+###Engineering Mode: Measured-Speed With Gear, Time-Based Cycle
+This driving cycle defines the actual measured speed of the vehicle, the gear, and the engine speed over time.
+It overrides the shift strategy of Vecto and also directly sets the engine speed.
-####Measured Speed Cycle With Gear and Engine Speed
-This cycle type defines the measured vehicle velocity, the road gradient and the gear and engine speed. It overrides the built-in shift strategy. From the vehicle speed and gear the needed torque can be calculated, and together with the engine speed the resulting engine power which is used for fuel consumption can be calculated. If the cross wind correction for the [Vehicle](#vehicle-editor) is set to "Vair & Beta" the columns \<vair_res\> and \<vair_beta\> are required.
+Header: **\<t>, \<v>, \<n>, \<gear>***\[, \<grad>]\[, \<Padd>]\[, \<vair\_res>, \<vair\_beta>]\[, \<Aux\_ID>\]*
-Header: **\<t\>,\<v\>,\<grad\>,\<Padd\>,\<n\>,\<gear\>** *\[,\<vair\_res\>,\<vair\_beta\>\]\[,\<Aux\_xxx\>\]*
+| Identifier | Unit | Description |
+| ----------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **t** | [s] | The absolute time. Must always be increasing. |
+| **v** | [km/h] | The actual velocity of the vehicle. Must be >= 0 km/h. |
+| **n** | [rpm] | The actual engine speed. Must always be >= 0 rpm. |
+| **gear** | [-] | The current gear. Must be >= 0 (0 is neutral). |
+| *Padd* | [kW] | Additional auxiliary power demand. This power demand will be directly added to the engine power in addition to possible other auxiliaries. Must be >= 0 kW. |
+| *grad* | [%] | The road gradient. |
+| *vair_res* | [km/h] | Air speed relative to vehicle for cross wind correction. Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**. |
+| *vair_beta* | [°] | Wind Yaw Angle for cross wind correction. Only required if [**Cross Wind Correction**](#cross-wind-correction) is set to **Vair & Beta Input**. |
+| *Aux_ID* | [kW] | Auxiliary Supply Power. Can be defined multiple times with different Identifiers. The supply power input for each auxiliary defined in the [.vecto file](#job-editor) with the corresponding ID. ID's are not case sensitive and must only contain letters and numbers [a-z,A-Z,0-9]. Must be >= 0 kW. |
-| Identifier | Quantity | Unit | Description
-| ---------- | -------- | ------ | ------------------------------------------------
-| **\<t\>** | Time | [s] | The absolute time.
-| **\<v\>** | Vehicle Speed | [km/h] | The actual velocity of the vehicle.
-| **\<grad\>** | Road Gradient | [%] | The road gradient.
-| **\<Padd\>** | Additional Aux Power Demand | [kW] | This power input will be directly added to the engine power.
-| **\<n\>** | Engine Speed | [rpm] | The engine speed (will always be maintained - even when \<v\> cannot be reached in the simulation)
-| **\<gear\>** | Gear | [-] | The current gear
-| *\<vair_res\>* | Air speed relative to vehicle | [km/h] | Only required if [Cross Wind Correction](#cross-wind-correction) in [Vehicle](#vehicle-editor) is set to **Vair & Beta Input**.
-| *\<vair_beta\>* | Wind Yaw Angle | [°] | Only required if [Cross Wind Correction](#cross-wind-correction) in [Vehicle](#vehicle-editor) is set to **Vair & Beta Input**.
-| *\<Aux\_xxx\>* | Auxiliary Supply Power | [kW] | Power input for each auxiliary defined in the [.vecto file](#job-editor) where "xxx" matches the ID of the corresponding [Auxiliary](#auxiliary-dialog). ID's are not case sensitive and may consist of word-characters only (A-Z, a-z, 0-9).
+**Example:**
-**\<bold\>** identifiers are required, *\<italic\>* are optional.
+| \<t> [m] | \<v> [km/h] | \<n> [rpm] | \<gear> [-] | \<grad> [%] | \<Padd> [kW] |
+| -------- | ----------- | ---------- | ----------- | ----------- | ------------ |
+| 0 | 0 | 600 | 0 | 2.95 | 1.5 |
+| 1 | 0.6 | 950 | 3 | 2.97 | 1.3 |
+| 2 | 1.2 | 1200 | 3 | 3.03 | 1.3 |
+| 3 | 2.4 | 1400 | 3 | 2.99 | 1.3 |
+###Engineering Mode: Pwheel (SiCo), Time-Based
+This driving cycle defines the power measured at the wheels over time. Vecto tries to simulate the vehicle with this power requirement.
-###Pwheel (SiCo) Mode Cycle
+Header: **\<t>, \<Pwheel>, \<gear>, \<n>***\[, \<Padd>]*
-Power measured at the
+| Identifier | Unit | Quantity Description |
+| ---------- | ----- | ----------------------------------------------------------------------------------------------------------------- |
+| **t** | [s] | The absolute time. Must always be increasing. |
+| **Pwheel** | [kW] | Power at the wheels. |
+| **gear** | [-] | The current gear. Must be >= 0 (0 is neutral). |
+| **n** | [rpm] | The actual engine speed. Must be >= 0 rpm. |
+| *Padd* | [kW] | Additional auxiliary power demand. This power demand will be directly added to the engine power. Must be >= 0 kW. |
+**Example:**
+| \<t> [m] | \<Pwheel> [kW] | \<gear> [-] | \<n> [rpm] | \<Padd> [kW] |
+| -------- | -------------- | ----------- | ---------- | ------------ |
+| 0 | 0 | 0 | 600 | 1.5 |
+| 1 | 4.003 | 3 | 950 | 1.3 |
+| 2 | 15.333 | 3 | 1200 | 1.3 |
+| 3 | 50.56 | 3 | 1400 | 1.3 |
-Header: **\<t\>**,**\<Pwheel\>**,**\<gear\>**,**\<n\>**,**\<Padd\>**
-| Identifier | Quantity | Unit | Description
-| ---------- | -------- | ------ | ------------------------------------------------
-| **\<t\>** | Time | [s] | The absolute time.
-| **\<Pwheel\>** | Wheel Power | [kW] | Power at the wheels.
-| **\<gear\>** | Gear | [-] | The current gear
-| **\<n\>** | Engine Speed | [rpm] | The engine speed (will always be maintained - even when \<v\> cannot be reached in the simulation)
-| **\<Padd\>** | Additional Aux Power Demand | [kW] | This power input will be directly added to the engine power.
+###Engine Only Mode: Engine Only Driving Cycle
+This driving cycle directly defines the power or torque at the output shaft of the engine over time.
+Header: **\<t>, \<n>, (\<Pe>|\<Me>)***\[, \<Padd>]*
-###Engine Only Mode Cycle
-Either power or torque must be defined.
+| Identifier | Unit | Description |
+| ---------- | ----- | ----------------------------------------------------------------------------------------------------------------- |
+| **t** | [s] | The absolute time. Must always be increasing. |
+| **n** | [rpm] | The actual engine speed. Must be >= 0 rpm. |
+| **Pe** | [kW] | The power at the output shaft of the engine. Either \<Pe> or \<Me> must be defined. |
+| **Me** | [Nm] | The torque at the output shaft of the engine. Either \<Pe> or \<Me> must be defined. |
+| *Padd* | [kW] | Additional auxiliary power demand. This power demand will be directly added to the engine power. Must be >= 0 kW. |
-Header: **\<t\>**,**\<n\>**,**[\<Pe\>|\<Me\>]**,**\<Padd\>**
+**Example:**
-| Identifier | Quantity | Unit | Description
-| ---------- | -------- | ------ | ------------------------------------------------
-| **\<t\>** | Time | [s] | The absolute time.
-| **\<n\>** | Engine Speed | [km/h] | The engine speed.
-| **\<Pe\>** | Engine Power | [kW] | The power consumption of the engine. (either power or torque must be defined)
-| **\<Me\>** | Engine Torque | [Nm] | The torque of the engine. (either power or torque must be defined)
-| **\<Padd\>** | Additional Aux Power Demand | [kW] | This power input will be directly added to the engine power.
+| \<t> [m] | \<n> [rpm] | \<Pe> [kW] | \<Padd> [kW] |
+| -------- | ---------- | ---------- | ------------ |
+| 0 | 600 | 0 | 1.5 |
+| 1 | 950 | 25.3 | 1.3 |
+| 2 | 1200 | 65.344 | 1.3 |
+| 3 | 1400 | 110.1 | 1.3 |