diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC.md b/Documentation/User Manual/3-simulation-models/Engine_FC.md
index 3343b67f659798759ba6dc9c584d6f336e2bb144..d87ae049395323ce5c908d8624de78e1e43c979f 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC.md	
@@ -1,7 +1,7 @@
 ##Engine: Fuel Consumption Calculation
 
 
-The base FC value is interpolated from the stationary [FC map](#fuel-consumption-map-.vmap). If necessary the base value is corrected to compensate for unconsidered auxiliary energy consumption for vehicles with Start/Stop. In Declaration Mode additionally the WHTC correction is applied, see below.
+The base FC value is interpolated from the stationary [FC map](#fuel-consumption-map-.vmap). If necessary the base value is corrected to compensate for unconsidered auxiliary energy consumption for vehicles with Start/Stop. In Declaration Mode [additional correction factors are applied](#engine-correction-factors).
 
 The CO~2~ result for the actual mission profile is directly derived from the fuel consumption using a gravimetric [CO~2~/FC factor](#settings).
 
@@ -26,4 +26,3 @@ The interpolation is based on [Delaunay Triangulation ![](pics/external-icon%20
 
 
 
-
diff --git a/Documentation/User Manual/3-simulation-models/Engine_WHTC.md b/Documentation/User Manual/3-simulation-models/Engine_WHTC.md
index cb76f859a8c942ddc3adbe69447cb8abafbb3d18..aa9ccf14a3bdfc37c3a77135f89713454b51fa77 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_WHTC.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_WHTC.md	
@@ -28,11 +28,11 @@ with the correction factor CF~urb~, CF~rur~, CF~mot~ coming from the [Engine](#e
 
 In order to balance the trade-off between emissions and fuel consumption during cold and hot starting conditions an additional balancing factor $CF_{C/H}$ is determined from the overall specific fuel consumption over the cold start and hot start WHTC test. Additional correction factors considered are regarding the net calorific value of the fuel ($CF_{NCV}$) and exhaust after-treatment systems ($CF_{RegPer}$). This values are part of the output from the engine component tool.
 
-The WHTC-corrected fuel consumption is then calculated with: $FC_{whtc} = FC \cdot CF_{total} \cdot CF_{C/H} \cdot CF_{RegPer} \cdot CF_{NCV}$
+The WHTC-corrected fuel consumption is then calculated with: $FC_{final} = FC \cdot CF_{total} \cdot CF_{C/H} \cdot CF_{RegPer}$
 </div>
 
 <div class="engineering">
 In engineering mode a single correction is applied by Vecto. The fuel consumption interpolated from the FC map is multiplied by the engineering correction factor. 
 
-$FC_{whtc} = FC \cdot CF_{Engineering}$
+$FC_{final} = FC \cdot CF_{Engineering}$
 </div>
\ No newline at end of file
diff --git a/Documentation/User Manual/help.html b/Documentation/User Manual/help.html
index 9d786a5ccd2ec447eeeb2d38dc358f1de3a7f29b..e75b8bfbdea8440c48111ab00f86d10ea262f903 100644
--- a/Documentation/User Manual/help.html	
+++ b/Documentation/User Manual/help.html	
@@ -3100,7 +3100,7 @@ Example: “Gears\Gear1.vtlm” points to the “Gears” subdirectory of the Ge
 </div>
 <div id="engine-fuel-consumption-calculation" class="section level2">
 <h2>Engine: Fuel Consumption Calculation</h2>
-<p>The base FC value is interpolated from the stationary <a href="#fuel-consumption-map-.vmap">FC map</a>. If necessary the base value is corrected to compensate for unconsidered auxiliary energy consumption for vehicles with Start/Stop. In Declaration Mode additionally the WHTC correction is applied, see below.</p>
+<p>The base FC value is interpolated from the stationary <a href="#fuel-consumption-map-.vmap">FC map</a>. If necessary the base value is corrected to compensate for unconsidered auxiliary energy consumption for vehicles with Start/Stop. In Declaration Mode <a href="#engine-correction-factors">additional correction factors are applied</a>.</p>
 <p>The CO<sub>2</sub> result for the actual mission profile is directly derived from the fuel consumption using a gravimetric <a href="#settings">CO<sub>2</sub>/FC factor</a>.</p>
 <div id="fuel-map-interpolation" class="section level3">
 <h3>Fuel Map Interpolation</h3>
@@ -3205,7 +3205,7 @@ Example: “Gears\Gear1.vtlm” points to the “Gears” subdirectory of the Ge
 </tbody>
 </table>
 <p>In order to balance the trade-off between emissions and fuel consumption during cold and hot starting conditions an additional balancing factor <img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAASBAMAAADiVjDOAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEImrmXYi3TJEu+9UzWb0kky/AAAACXBIWXMAAA7EAAAOxAGVKw4bAAABGUlEQVQYGXWOsUvDQByFv4QmjbGSLM4WSnESi+CqDoqgS1Ti5FDQToq6ODgIWRycjJNuhv4FncQxs5N/gXYScZAiFhwcfMFWTNAHd/d+7zvuHmDUloIWxvL74kqfgiYjzGMYa8BWAbkJOD3wUrgqsFVfgfi173CRZyOf2ZzCFOaQOAPjdgbmpPbTZHwQeaqQyfjgWXs9bMET2317PsALBGyo9IjhrskDLGA12IDRjKlf6V6ncwib2AFulzlliV4SL1fFyilEWE28Jjeaj+BUx0GsbUJL1+E8XO/IWTNhBOZjW/5Sy2cfXqgk8r+1q04+azBLSf/k5MacZTW5pRzliIb6a4TTZefNnq4WWTab/l/pd6aa/2pvSL4A24szwPRX4SwAAAAASUVORK5CYII=" alt="CF_{C/H}" title="CF_{C/H}" /> is determined from the overall specific fuel consumption over the cold start and hot start WHTC test. Additional correction factors considered are regarding the net calorific value of the fuel (<img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAAPBAMAAABHIsEFAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEImrmXYi3TJEu+9UzWb0kky/AAAACXBIWXMAAA7EAAAOxAGVKw4bAAABD0lEQVQYGW2PPUjDUBSFv4QkJjU/pd1cFCo4CVJwd1AEXQJSJxGhODjp4lBQyCIODuoibhYHoVtHJ0nnLh3dfGMXIUIrDg7eJ04vHri8y/ku590LWI2N9BBrc7K+NaWkpQy7A9EK7JVgpQt+AUkO9yW6XRVLJh6qPrcmDb61k8Mytsmg0v/zzhv/7JTIMlrWF2NofzBco9baTetTgheSVJAHYcENxE1cwici5RUEGbOayq7OSCfEV8RcgnvAp3Q4XUmViZmFXxrld5zJidBBiXMKF/IcSy4chSNlFbpj1dOO22xlYL89akvxrIITSYNFCTak2FFeHwbwLmUoZT6jhy+h17nBaL/iyC/7cjlzUj+gsDuEowrDawAAAABJRU5ErkJggg==" alt="CF_{NCV}" title="CF_{NCV}" />) and exhaust after-treatment systems (<img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAASBAMAAAAUH7VWAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEImrmXYi3TJEu+9UzWb0kky/AAAACXBIWXMAAA7EAAAOxAGVKw4bAAABP0lEQVQoFXWPPUjDUBRGT2LTn/QnQVzEpVDESRDBVYoogoJUsItoEdTFDroIERQCRVzrpItYBHcXB7cMCg4OHd0URaggpYoFBwfvw0CsNHc67/sO3PsALTdVWEeb/pycaRMyQy76DqRHYClEMWsQb4HlwXGIM2tLId6pHeewu5P4VrkHw+jdDTAv/GYvF3qxJaeq0b5owOrlQuH3rdCvsFQWhVSLKhh5dn1HcMLHpHLkP5G6CkyPK78QPPcxUpM94sWyKrBWMgWK89wsYtmJumDvXAm2YV/aTdkE5RcH071N5QcoN0sKvfc7OWG06IL+cKacZ044eKvGqhVBFMZrKv874xxxLSvtImOSCxrq3o5xWI5W6E9yjyOFYI/bIUBfm41XvfmYKbXWPqQTTP9Tgqe2FXAINYxsSBPEg08Bww/Qj0riiIvc1AAAAABJRU5ErkJggg==" alt="CF_{RegPer}" title="CF_{RegPer}" />). This values are part of the output from the engine component tool.</p>
-<p>The WHTC-corrected fuel consumption is then calculated with: <img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYwAAAASBAMAAAC6DPT+AAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAEJndu3bNq1REMolmIu/6EsjwAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAEZElEQVRIDc1VXYgbVRT+JplJMj/ZDLVWyooNay2Ci6wPil0fzIM+uKLOinHVppAXEdqKUSgKFZwt/uGDxhb6UJSORCm+1KBsi08Oxf64jRDWllWQdXzoQ0uFrLj4UwTPvTd3MpNJNvuieGDmnnO+77vnzJ17ZwDl1l8ntq8ByqnbnEsYbpvun5h4zAHGXyrnaeiaiCQms5FxJEHUlV1ElAl3fWamBjwFfOHB3JmQRhLPAZoLc5qodZmWkcBkNjKOJMi63S4i0oTb7XAIs+ACR6GWAKOTkEYSfwC6hwco81mYlZHAwnTPGUmQdUUXPWHSG8E8Zht4H3faJCwlxWFGX4Wn26mfKaHKpIwEJrORcSQhrCu6iEgTruxwCPMkTFpnWk/ATWh7CbOKJnCMUXIyKyOByWxkHEAwInCkLu8iBvUFYYdDmPecogOuBn2qRJje+5oDPBrLy0hgMUgEAwg3xmhhXd5FDOoLRjCVv7AIFGo91WZq9yMRpl5mRm8B2OZZHvC7yAMNCsKIY4bNMC7Uf6GDRt+COAHj5d0OvsXyWp6tCJ9C1hVdLF9+nAHMyK0Jj+6sWB9zFe8WoSyUL920Bv0a7ZAO6kRi8rzQZSl+XriR+3vQKaIXB7TpOkGkMOJYhqW7woAe40o/IfcIMj6K0GqYI4xPIeuKLrQi7mUIGbl3CI/urFicaR2ABrzexr58h315kKoy9phDt6PMA9J0BcyJ2Q4eXaY7UwmTEcfGeC5gd6PGfSBGaFBzbfrnqD5e7eJhXdGF6oI9PDPVxYNsDE12KJjWCVgwpoDd+Js8arrJmKkS/QAdWqUXL+K7VvHQs7Z2xqN0b1PdB2bb6ertbhkxTN8xi8qXJDRPFzW2KMyiBLbQBj0ICm3QphOWKvG63S4KbctBeRZvPIGCrVfJHZ+sDGRaGfdDpF3Aw074RPmpznl3A5/AStuBijcRUB+vmALgKG24P7mTdmDIHmkJRCSwMrJumoQzmqN6XVWUoHRYMkW/nfKuoIsDvK7sYuXMNFTvnVzxFqy0Ksx1V9+W1Bjzh1zVxzYO7c9To+YLD/NAO1D2gBuMkobblSnVYy8said/a/JwbuGZSFpEAptBAwUSBtm62F+MFyHoNKOCH4GvkSuFc4i63S7O4Qga5+vp+nGcIwa5xhCmj6s+DhPHxudsT8XtoNW8GXflimOwinFkdBTgNI6QsJa2Px7EzgfAPGaB/Ug5gwigI3MYB+k022Uigbnh9uwT+JjzsUIfKBtn5/swoGI688pU9oMtll5TvAS8XkKp+ocws8XKNRtbL7iDmA/BqKMIXEXaG4QD03gyfxxbx7CHXIDc7BCmQz8AqHV8SnvUTUy2dH6ybjStp1OLWGgl0PUTk565yyPh5FvOUnJm0pqVRRg+lq7nvxIbtH++TWu4+I3Z8q1KZ+k6E7T8TD9HxMt72CGjHj1g82DKv5o17Y1Mr9Ax+l8bW8ORtqgNflsjhf8Z4fuNVFq4sBFWlPMPEKtTNJy9ETQAAAAASUVORK5CYII=" alt="FC_{whtc} = FC \cdot CF_{total} \cdot CF_{C/H} \cdot CF_{RegPer} \cdot CF_{NCV}" title="FC_{whtc} = FC \cdot CF_{total} \cdot CF_{C/H} \cdot CF_{RegPer} \cdot CF_{NCV}" /></p>
+<p>The WHTC-corrected fuel consumption is then calculated with: <img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUgAAAASCAMAAAAOqLckAAAAM1BMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADxgEwMAAAAEHRSTlMAEJndu3bNq1REMolmIu9O/iFjzgAAAAlwSFlzAAAOxAAADsQBlSsOGwAAA7lJREFUWAnVVuuaqyAMBBQVAY/v/7RnJoBFXay2+2f5Wi6RTEJuoJRS2nSrQetXixXWfjTWqphWQnraPYCspR3Z7on9HmF/5M+0EF2HUQY7cfDdnAYnxA+7u5AHaTu2e6K/Rzgd+QMtkq6rWFA5WrDvE21e752jsesm5FFazdZAPpC/Rzgf+bkWSSm3aqVgRIfBLOikZYPm1cPhJuRRWs12T+L3COcjP9ci6+oHTLwsXHYGFilK85anwz3Ik7SK7Z7EmwhSrBqIJwj1WIuC3A1+zBdNvxTid+M9yJO0iu2e/HsI+urePEGox1pkXfUKh4XktDVdO9spZk/ClMJ1o6IKLDGvzLi1164rSFSRdJ0pdZRWsc2lwmD7a1rE3kHAVWytlbdHgLKRsSJdUrwJoSot4rhYa45uSNSDpWgmXiv5is6BCUIyVKeZ4a+TYJHadeReQcIyS0NaxTYURylVTVUWewdh6gkxBHSGOlueXDqu2krs7GHJ2h2rnFDNK24EEGJYInNbivXlBle6Kx8O43z2R73jArLedpBWa1I5qpqexLYR5qS6ZTDKoXqadGS3b0eIWgvV04bF7xufUPtiqo3cVaY1+a5OVSWOA3fDjdp6Fwxd7IOBl/Bgz+3H1G5DFjYZ99Lg+qKJM4NFGtjgXZ4exRbpO30rhBJGrFg0JuoI+60ikZLaUYmXFvhOpoCzokhAn8lakcdXjmP4kay9CZb+iWv98u7EQnO2EzFUUExwFFKP7f0sRsRw0a4gd2x7aRWbOGpEOHTJZ02xLQRdPYMls+cVp/ZVdG+K7CF29ohLsCzoED/hZ5QmAKjJdEKGafQETf2w9iUQiG1H1OhiJiPVIcL4M1wxzqgsGGD4nxTaNLuE3HbJpJZWs9FRkpwrD3EltoHgclFC7ERJ58BYmnIAt5XY2yOggiH05i5MOHTnlNQWUtkymaZ511KdZyQyRGA9YnRazPqO96vvdFRAJOEUMn0sNiZXTywQ+MP9TK7TBcwvF40lFS5BKLIho1Om5HzN5FeZayMlbTodGBdujA4PobnTLngJ1Tbjl1/0gILioH4/y/QDsT0L1swuWWFhlpV31131uN8O6h/8qB1dOtQoDE+QkajvWr60Pao1wlfTPyZM8G1MOf+O//Pvhu9abz16mX4g1tsgj+OZmR3N6lX06B40bfgajH1wPgSgoDCi8gpUQknk6tHTAmdM/PnmJbN/5xjN5+AlfDSWmfHX268FA+LbPoroYrl4fruXT39ojL9WzVEr2nb8D4p8ISi4QxqKAAAAAElFTkSuQmCC" alt="FC_{final} = FC \cdot CF_{total} \cdot CF_{C/H} \cdot CF_{RegPer}" title="FC_{final} = FC \cdot CF_{total} \cdot CF_{C/H} \cdot CF_{RegPer}" /></p>
 </div>
 <div class="engineering">
 <p>In engineering mode a single correction is applied by Vecto. The fuel consumption interpolated from the FC map is multiplied by the engineering correction factor.</p>