diff --git a/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md b/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md
new file mode 100644
index 0000000000000000000000000000000000000000..ff90f192178f7eebe6088cd4e2f871d61f3906c7
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/Engine_Speed_Torque_limitations.md
@@ -0,0 +1,3 @@
+
+###Engine Torque and Engine Speed Limitations
+
diff --git a/Documentation/User Manual/3-simulation-models/GearShift.md b/Documentation/User Manual/3-simulation-models/GearShift.md
index e171186b8f32f72fde7cc763e2727f5d5468e9c8..e1ec38aed0fe5fe84e980405d1a46cc0231e20fb 100644
--- a/Documentation/User Manual/3-simulation-models/GearShift.md
+++ b/Documentation/User Manual/3-simulation-models/GearShift.md
@@ -1,4 +1,4 @@
-##Gear Shift Model (MT, AMT)
+##Gear Shift Model
The Gear Shift Model is based on shift curves that define the engine speed for up- and down- shifting as a function of engine torque. As soon as the engine operation point passes one of the shift curves a gear change is initiated.
diff --git a/Documentation/User Manual/3-simulation-models/GearShift_AMT.md b/Documentation/User Manual/3-simulation-models/GearShift_AMT.md
new file mode 100644
index 0000000000000000000000000000000000000000..ddc1ff320dadf4519b54dedcbadcacee17835c28
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/GearShift_AMT.md
@@ -0,0 +1,55 @@
+##Gear Shift Rules for AMT Gearbox
+
+###Computation of Shift Polygons in Declaration Mode (According to ACEA Whitebook 2016)
+
+####1. Computation of Characteristic Points
+
+
+####2. Definition of Shift Lines
+
+
+####3. Exception 1: Margin to Max-Torque line (Downshift)
+
+
+Note: Line L1 is shiftet parallel so that it satisfies the max-torque margin condition, not intersected.
+
+####4. Exception 2: Minimal Distance between Downshift and Upshift Lines
+
+
+####5. Final Gearshift Lines (Example)
+
+
+If the gearbox defines a maximum input speed for certain gears the upshift line may further be intersected
+and limited to the gear's maximum input speed.
+
+###Upshift rules
+
+* If the engine speed is higher than the gearbox maximum input speed or engine n_{95h} speed (whichever is lower)
+* If all of the following conditions are met:
+ - The vehicle is not decelerating
+ - Engine operation point (speed and torque) is above (right of) the upshift line AND
+ - The acceleration in the next gear is above a certain threshold if the driver is accelerating, i.e., acceleration_nextGear > min(Min. acceleration threshold, Driver acceleration) AND
+ - The last gearshift was longer than a certain threshold (Declaration Mode: 2s) ago AND
+ - The last downshift was longer than a certain threshold (Declaration Mode: 10s) ago
+
+
+###Downshift
+
+* If the engine speed is lower than the engine's idle speed
+* If all of the following conditions are met:
+ - Engine operation point (speed and torque) is below (left of) the downshift line AND
+ - The last gearshift was longer than a certain threshold (Declaration Mode: 2s) ago AND
+ - The last upshift was longer than a certain threshold (Declaration Mode: 10s) ago
+
+
+###Shift parameters
+
+- Gearshift lines
+- Engine idle speed
+- Gearbox max. input speed
+- Engien n_{95h} speed
+- Min. time between two consecutive gearshifts.
+- Min. time for upshift after a downshift
+- Min. time for downshift after an upshift
+- Min. acceleration in next gear
+
diff --git a/Documentation/User Manual/3-simulation-models/GearShift_AT.md b/Documentation/User Manual/3-simulation-models/GearShift_AT.md
index bdf01ed4ecbad26e521489ffd853d87eddd1e67c..a916f4d470d11c6f34a777c01fcdd112036f2143 100644
--- a/Documentation/User Manual/3-simulation-models/GearShift_AT.md
+++ b/Documentation/User Manual/3-simulation-models/GearShift_AT.md
@@ -1,4 +1,4 @@
-##Gear shift rules for AT Gearbox
+##Gear Shift Rules for AT Gearbox
The gear shift rules for automatic gearboxes differ from AMT and MT.
diff --git a/Documentation/User Manual/3-simulation-models/simulation-models.md b/Documentation/User Manual/3-simulation-models/simulation-models.md
index 4844eefd8704739b05e130ff2ea8377d962b36fa..4bf3dedcfefc9c240b62c30a0821ed28951d05a9 100644
--- a/Documentation/User Manual/3-simulation-models/simulation-models.md
+++ b/Documentation/User Manual/3-simulation-models/simulation-models.md
@@ -12,6 +12,7 @@ In this chapter the used component models for the simulation are described.
* [Engine: Fuel Consumption Calculation](#fuel-consumption-calculation)
* [Engine: Transient Full Load](#transient-full-load)
* [Engine: WHTC Correction](#transient-full-load)
+* [Engine Torque and Engine Speed Limitations](#engine-torque-and-engine-speed-limitations)
* [Gear Shift Model](#gear-shift-model)
* [Torque Converter Model](#torque-converter-model)
* [Auxiliaries](#auxiliaries)
diff --git a/Documentation/User Manual/files.txt b/Documentation/User Manual/files.txt
index 2e51a26af1cad1d59757015c50fa8c7b707b3018..4f710ca1d2cabc942af7e3e5a3430e190d38a0c6 100644
--- a/Documentation/User Manual/files.txt
+++ b/Documentation/User Manual/files.txt
@@ -31,6 +31,7 @@
3-simulation-models/Transmission_Losses.md
3-simulation-models/Gearbox_AT.md
3-simulation-models/GearShift.md
+3-simulation-models/Gearshift_AMT.md
3-simulation-models/Gearshift_AT.md
3-simulation-models/Engine_Speed_Torque_limitations.md
3-simulation-models/TC.md
diff --git a/Documentation/User Manual/pics/shiftlines_1.PNG b/Documentation/User Manual/pics/shiftlines_1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..14ff762e3df675799def971b21e4f964b364b6d9
Binary files /dev/null and b/Documentation/User Manual/pics/shiftlines_1.PNG differ
diff --git a/Documentation/User Manual/pics/shiftlines_2.PNG b/Documentation/User Manual/pics/shiftlines_2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..01bbda4d60d6d43caaae3d312152081c3e77e528
Binary files /dev/null and b/Documentation/User Manual/pics/shiftlines_2.PNG differ
diff --git a/Documentation/User Manual/pics/shiftlines_3.PNG b/Documentation/User Manual/pics/shiftlines_3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..a57bd7554f4fff09e5e4dca98ae5be4989b39813
Binary files /dev/null and b/Documentation/User Manual/pics/shiftlines_3.PNG differ
diff --git a/Documentation/User Manual/pics/shiftlines_4.PNG b/Documentation/User Manual/pics/shiftlines_4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..0356d75767216e567c0521a905abfc4c0f1295e1
Binary files /dev/null and b/Documentation/User Manual/pics/shiftlines_4.PNG differ
diff --git a/Documentation/User Manual/pics/shiftlines_5.PNG b/Documentation/User Manual/pics/shiftlines_5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..b7b1a9e23e388d0da84d0df11893f0921ad488ad
Binary files /dev/null and b/Documentation/User Manual/pics/shiftlines_5.PNG differ