diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index 644da2d8df0cd8055af516e311b762aac6ad91cb..dedaa0870e0891e3d6dee554da2b8b40b51d0d40 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md	
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md	
@@ -155,13 +155,13 @@ Three options are available:
 
 
 
-## Vehicle Editor -- Electric Components Tab
+## Vehicle Editor -- Electric Machine Tab
 
-![](pics/VECTO_VehicleEditor_ParHyb_El.png)
+![](pics/VehicleForm_ElectricMachine.png)
 
-For hybrid vehicles and battery electric vehicles the input elements on the *electric components* tab are enabled. Here the component file for the eletric motor and battery pack can be loaded or created (see [Electric Motor Editor](#electric-motor-editor), [Electric Energy Storage Editor](#rechargeable-electric-energy-storage-editor))
+For hybrid vehicles and battery electric vehicles the input elements on the *electric machine* tab is enabled. Here the component file for the eletric motor can be loaded or created (see [Electric Motor Editor](#electric-motor-editor))
 
-The position where the electric machine is positioned in the powertrain can be selected. It is possible that the electric machine is connected to the powertrain via a fixed gear ratio.
+The position where the electric machine is located in the powertrain can be selected. It is possible that the electric machine is connected to the powertrain via a fixed gear ratio.
 At the moment electric machines are supported to be present at a single position only. It is not possible to have an electric motor at position P2 and another at position P4!
 However, it is possible that more than one electric machine is used at a certain position. 
 
@@ -170,6 +170,13 @@ The *Loss map EM ADC* can be used to consider the losses of a transmission step
 In case of a P2.5 configuration (the electric motor is connected to an internal shaft of the tranmission) the transmission ratio for every single gear of the transmission has to be specified in the list to the right of the electric motor parameters. The ratio is defeined as $n_\textrm{GBX,in} / n_\textrm{EM}$ in case of EM without additional ADC or $n_\textrm{GBX,in} / n_\textrm{ADC,out}$ in case of EM with additional ADC.
 
 
+
+## Vehicle Editor -- REESS Tab
+
+![](pics/VehicleForm_REESS.png)
+
+For hybrid vehicles and battery electric vehicles the input elements on the *rechargeable electric energy storage system (REESS)* tab is enabled. Here the component file for the battery pack can be loaded or created (see [Electric Energy Storage Editor](#rechargeable-electric-energy-storage-editor))
+
 For the electric energy storage multiple battery packs can be configured either in series or in parallel and the initial state of charge of the whole battery system can be defined.  For every entry of a battery pack the number of packs (count) in series and a stream identifier need to be specified. Battery packs on the same stream are connected in series (e.g., two different battery packs on stream number 1 are in series) while all streams are then connected in parallel (see [Battery Model](#ress) for details). This is only supported for batteries and **not** for SuperCaps.
 
 **Double-click** an entry to edit.
@@ -182,6 +189,25 @@ In the REESS Dialog the battery file itself and how it is connected to the elect
 
 ![](pics/BatteryPackDialog.png)
 
+## Vehicle Editor -- IEPC Tab
+
+![](pics/VehicleForm_IEPC.png)
+
+For battery electric vehicles of type IEPC-E or hybrid vehicles of type IEPC-S, the tab for the *integrated electric powertrain component (IEPC)* is visible. Here the component file for the IEPC can be loaded or created (see [IEPC Editor](#iepc-editor)).
+
+## Vehicle Editor -- IHPC Tab
+
+![](pics/VehicleForm_IHPC.png)
+
+For hybrid vehicles if type IHPC the input tab for *integrated hybrid powertrain component (IHPC)* is visible. Here the component file for the electric machine part of the IHPC can be loaded or created (see [IHPC Editor](#ihpc-editor))
+
+## Vehicle Editor -- GenSet Tab
+
+![](pics/VehicleForm_GenSet.png)
+
+For serial hybrid vehicles the *GenSet tab* is visible. On this tab the electric machine used as generator connected to the combustion engine can be specified (see [Electric Motor Editor](#electric-motor-editor)). It is possible to have multiple equal electric machines as generator. The electric machines can be connected via a transmission to the combustion engine.
+
+The *Loss map EM ADC* can be used to consider the losses of a transmission step between drivetrain and electric machine or to consider losses of a summation gear. The loss map has the same format as for all other transmission components (see [Transmission Loss Map (.vtlm)](#transmission-loss-map-.vtlm)). For simplicity or if no such transmission step is used it is possible to enter the efficiency directly (i.e., "1" if no transmission step is used).
 
 ## Vehicle Editor -- Torque Limits Tab
 
diff --git a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
index f05e2240fd32ae7d61550171941a833025425b76..7e0b88e4c37561618ab23854a0748e03f466e2cc 100644
--- a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md	
+++ b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md	
@@ -11,7 +11,7 @@ The electric motor file defines all parameters relevant for the electric machine
 
 It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. 
 
-VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
 
 
 ### Main Parameters
diff --git a/Documentation/User Manual/1-user-interface/N_IEPC.md b/Documentation/User Manual/1-user-interface/N_IEPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..44a780d95230eda67c203ee3f48c33b3a32e35de
--- /dev/null
+++ b/Documentation/User Manual/1-user-interface/N_IEPC.md	
@@ -0,0 +1,92 @@
+## IEPC Editor
+
+![](pics/IEPC_Form.png)
+
+
+### Description
+
+Integrated electric powertrain component (IEPC) means a combined system of an electric machine system together with the funcitonality of either a single- or multi-speed gearbox or a differential or both. 
+
+An IEPC can be of design-type wheel motor which means that the output shaft (or two output shafts) are directly connected to the wheel hub(s). The IEPC component file defines all parameters relevant for the electric machine. These are the motor's maximum drive and recuperation torque, the drag torque as well as the electric power map.
+
+An IEPC may have several shiftable transmission steps or only a single gear stage between the output shaft and the electric machine. The electric power consumption map has to be provided for every gear. 
+
+### Relative File Paths
+
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. 
+
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+
+
+### Main Parameters
+
+Make and Model
+:   Free text defining the gearbox model, type, etc.
+
+Inertia \[kgm²\]
+:   Rotational inertia of the gearbox (constant for all gears). (Engineering mode only)
+
+Gears
+:   Gear ratios of the transmission steps of the IEPC
+
+Continuous Torque \[Nm\]
+:    The nominal torque the electric machine can provide continuously
+
+Test Speed Continous Torque \[rpm\]
+:    Angular speed at which the continouos torque can be provided
+
+Overload Torque \[Nm\]
+:    Maximum torque above the continuous torque the electric motor can provide for a certain time
+
+Test Speed Overload Torque \[rpm\]
+:    Angular speed at which the overload torque was measured
+
+Overload Duration \[s\]
+:    The time interval the electric machine can operate at its peak performance
+
+Thermal Overload Recovery Factor
+:    The accumulated overload energy has to be below the max. overload capacity multiplied by this factor so that the peak power is available again.
+
+Drag Torque Curve
+:   The motor's drag torque over engine speed when the motor is not energized. The torque values in the drag curve have to be negative. (see [IEPO Drag Curve File (.viepcd)](#iepc-drag-curve-file-.viepcd))
+
+Max. Drive and Max. Generation Torque Curve
+:   Torque over engine speed the electric motor can apply on its output shaft. (see [IEPC Max Torque File (.vemp)](#iepc-max-torque-file-.viepcp)). The max drive and max generation torque have to be provided for two different voltage levels.
+
+Electric Power Consumption Map
+:   Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [IEPC Map (.viepco)](#iepc-map-.viepco)). The power map has to be provided for two different voltage levels and all gears.
+
+Voltage Level Low/High
+:    Applicable voltage level for the electric power consumption map and max drive/generation torque curve
+
+
+
+### Controls
+
+
+![](pics/blue-document-icon.png) New file
+:   Create a new empty .vem file
+
+![open](pics/Open-icon.png)Open existing file
+:   Open an existing .vem file
+
+
+![save](pics/Actions-document-save-icon.png) ***Save current file***
+
+![SaveAs](pics/Actions-document-save-as-icon.png) ***Save file as...***
+
+![sendto](pics/export-icon.png) Send current file to the [VECTO Editor](#job-editor)
+:   **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+
+![](pics/browse.png) ***Open file browser***
+
+![](pics/OpenFile.PNG) ***Open file*** (see [File Open Command)](#settings).
+
+![OK](pics/OK.png) Save and close file
+:   If necessary the file path in the [VECTO Editor](#job-editor) will
+be updated.
+
+
+![Cancel](pics/Cancel.png) ***Cancel without saving***
+
diff --git a/Documentation/User Manual/1-user-interface/O_IHPC.md b/Documentation/User Manual/1-user-interface/O_IHPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..10c4093aaf4a6091f4a8fcea92842fdd0db039e8
--- /dev/null
+++ b/Documentation/User Manual/1-user-interface/O_IHPC.md	
@@ -0,0 +1,90 @@
+## IHPC Editor
+
+![](pics/IHPC_Form.png)
+
+
+### Description
+
+Integrated hybrid electric vehicle powertrain component (IHPC) means a combined system of multiple electric machine systems together with the functionality of a multi-speed gearbox.
+
+For an IHPC the 
+
+### Relative File Paths
+
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. 
+
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+
+
+### Main Parameters
+
+Make and Model
+:   Free text defining the gearbox model, type, etc.
+
+Inertia \[kgm²\]
+:   Rotational inertia of the gearbox (constant for all gears). (Engineering mode only)
+
+Gears
+:   Gear ratios of the transmission steps of the IEPC
+
+Continuous Torque \[Nm\]
+:    The nominal torque the electric machine can provide continuously
+
+Test Speed Continous Torque \[rpm\]
+:    Angular speed at which the continouos torque can be provided
+
+Overload Torque \[Nm\]
+:    Maximum torque above the continuous torque the electric motor can provide for a certain time
+
+Test Speed Overload Torque \[rpm\]
+:    Angular speed at which the overload torque was measured
+
+Overload Duration \[s\]
+:    The time interval the electric machine can operate at its peak performance
+
+Thermal Overload Recovery Factor
+:    The accumulated overload energy has to be below the max. overload capacity multiplied by this factor so that the peak power is available again.
+
+Drag Torque Curve
+:   The motor's drag torque over engine speed when the motor is not energized. The torque values in the drag curve have to be negative. (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd))
+
+Max. Drive and Max. Generation Torque Curve
+:   Torque over engine speed the electric motor can apply on its output shaft. (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The max drive and max generation torque have to be provided for two different voltage levels.
+
+Electric Power Consumption Map
+:   Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.viepco)](#electric-motor-map-.vemo)). The power map has to be provided for two different voltage levels and all gears.
+
+Voltage Level Low/High
+:    Applicable voltage level for the electric power consumption map and max drive/generation torque curve
+
+
+
+### Controls
+
+
+![](pics/blue-document-icon.png) New file
+:   Create a new empty .vem file
+
+![open](pics/Open-icon.png)Open existing file
+:   Open an existing .vem file
+
+
+![save](pics/Actions-document-save-icon.png) ***Save current file***
+
+![SaveAs](pics/Actions-document-save-as-icon.png) ***Save file as...***
+
+![sendto](pics/export-icon.png) Send current file to the [VECTO Editor](#job-editor)
+:   **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+
+![](pics/browse.png) ***Open file browser***
+
+![](pics/OpenFile.PNG) ***Open file*** (see [File Open Command)](#settings).
+
+![OK](pics/OK.png) Save and close file
+:   If necessary the file path in the [VECTO Editor](#job-editor) will
+be updated.
+
+
+![Cancel](pics/Cancel.png) ***Cancel without saving***
+
diff --git a/Documentation/User Manual/3-simulation-models/IHPC.md b/Documentation/User Manual/3-simulation-models/IHPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..b54c4a93f94ba533adab2958891307ff887b67d4
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/IHPC.md	
@@ -0,0 +1,18 @@
+## Integrated Hybrid Electric Powertrain Component (IHPC)
+
+Integrated hybrid electric powertrain component (IEPC) means a combined system of multiple electric machine systems together with the functionality of a multi-speed gearbox. An electric machine of type IHPC has to be used together with a gearbox of type IHPC.
+
+The IEPC is modeled by the following parameters and map files:
+
+- Maximum drive torque over rotational speed (related to the output shaft)
+- Maximum generation torque over rotational speed (Related to the output shaft)
+- Drag curve (shall be 0 as the drag losses are covered by the gearbox model)
+- Electric power map for all mechanical gears
+- Continuous torque and rotational speed (output shaft), measured with the gear with the ratio closest to 1
+- Overload torque and rotational speed (output shaft), measured with the gear with the ratio closest to 1
+- Maximum overload time
+
+The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve(s) are provided in .viepcd file(s) (see [IEPC Drag Curve File (.viepcd)](#electric-motor-drag-curve-file-.vemd)) and the electric power maps in .viepco file(s) (see [IEPC Power Map (.viepco)](#electric-motor-power-map-.vemo)). 
+
+In the VECTO simulation, the IHPC component is similar to an electric motor, except the electric power maps are gear dependent.
+
diff --git a/Documentation/User Manual/files.txt b/Documentation/User Manual/files.txt
index 84c15e6c13d60eb90d2ce3c5eaa21b787dcad2b5..c1599e07eeb224587db1858b7f1d3434296b428b 100644
--- a/Documentation/User Manual/files.txt	
+++ b/Documentation/User Manual/files.txt	
@@ -11,6 +11,8 @@
 1-user-interface/H1_HybridStrategyParams-Editor.md
 1-user-interface/L_ElectricMotor.md
 1-user-interface/M_BatteryPackEditor.md
+1-user-interface/N_IEPC.md
+1-user-interface/O_IHPC.md
 1-user-interface/I_Graph.md
 4-command-line-arguments/cmd.md
 2-calculation-modes/calculation-modes.md
@@ -47,6 +49,7 @@
 3-simulation-models/PTO.md
 3-simulation-models/Electric_Motor.md
 3-simulation-models/IEPC.md
+3-simulation-models/IHPC.md
 3-simulation-models/Electric_Storage.md
 3-simulation-models/HybridControlStrategy.md
 5-input-and-output-files/input-output.md
diff --git a/Documentation/User Manual/pics/IEPC_Form.png b/Documentation/User Manual/pics/IEPC_Form.png
new file mode 100644
index 0000000000000000000000000000000000000000..eba91e89e20ded478366b857ef4017325a212a1f
Binary files /dev/null and b/Documentation/User Manual/pics/IEPC_Form.png differ
diff --git a/Documentation/User Manual/pics/IHPC_Form.png b/Documentation/User Manual/pics/IHPC_Form.png
new file mode 100644
index 0000000000000000000000000000000000000000..9087ad8227b5bae8f3262484458b9b1c97e57c5b
Binary files /dev/null and b/Documentation/User Manual/pics/IHPC_Form.png differ
diff --git a/Documentation/User Manual/pics/P1Tests.png b/Documentation/User Manual/pics/P1Tests.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c4e0bcfd114219f4314c70c289526d0780b4f6
Binary files /dev/null and b/Documentation/User Manual/pics/P1Tests.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_ElectricMachine.png b/Documentation/User Manual/pics/VehicleForm_ElectricMachine.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd1805a644b6b9dd4ff6c1d9e564fcb5e0b2d8b
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_ElectricMachine.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_GenSet.png b/Documentation/User Manual/pics/VehicleForm_GenSet.png
new file mode 100644
index 0000000000000000000000000000000000000000..05214b4d42c1f368afe301068bb768f9dc280f00
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_GenSet.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_IEPC.png b/Documentation/User Manual/pics/VehicleForm_IEPC.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c78ce6c58bf6b90e367cd4648113ab120a948d
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_IEPC.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_IHPC.png b/Documentation/User Manual/pics/VehicleForm_IHPC.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3ec75799806b7d692332f1e063667344f867baa
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_IHPC.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_REESS.png b/Documentation/User Manual/pics/VehicleForm_REESS.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed0b18f04d46cf8d21aa7b65fdecfc11518b3d9
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_REESS.png differ