diff --git a/build.gradle b/build.gradle
index 07e034ef..d19b7172 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'jacoco'
 apply plugin: 'org.asciidoctor.convert'
 
 group = 'com.upc.gessi.qrapids'
-version = '1.2'
+version = '1.3'
 sourceCompatibility = 1.8
 
 war {
diff --git a/docs/asciidoc/index.adoc b/docs/asciidoc/index.adoc
index 5b59b30d..3638117e 100644
--- a/docs/asciidoc/index.adoc
+++ b/docs/asciidoc/index.adoc
@@ -1,5 +1,5 @@
 = Q-Rapids Dashboard API REST Documentation
-v1.2, {docdate}
+v1.3, {docdate}
 :toc: left
 
 :sectnums:
diff --git a/docs/asciidoc/index.html b/docs/asciidoc/index.html
index 69e0855e..a77c8c76 100644
--- a/docs/asciidoc/index.html
+++ b/docs/asciidoc/index.html
@@ -5,7 +5,7 @@
 <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="generator" content="Asciidoctor 1.5.8">
-<meta name="author" content="v1.2, 2020-01-29">
+<meta name="author" content="v1.3, 2020-04-24">
 <title>Q-Rapids Dashboard API REST Documentation</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -435,7 +435,7 @@
 <div id="header">
 <h1>Q-Rapids Dashboard API REST Documentation</h1>
 <div class="details">
-<span id="author" class="author">v1.2, 2020-01-29</span><br>
+<span id="author" class="author">v1.3, 2020-04-24</span><br>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -649,6 +649,16 @@ <h4 id="_get_current_evaluation_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -736,7 +746,7 @@ <h4 id="_get_current_evaluation_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 1013
+Content-Length: 1065
 Content-Type: application/json;charset=UTF-8
 
 [ {
@@ -774,6 +784,8 @@ <h4 id="_get_current_evaluation_http_response">HTTP response</h4>
   "categories_description" : "[Good (0,67), Neutral (0,33), Bad (0,00)]",
   "hasBN" : false,
   "hasFeedback" : false,
+  "confidence80" : null,
+  "confidence95" : null,
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingFactors" : null
@@ -906,6 +918,16 @@ <h4 id="_get_one_current_evaluation_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -993,8 +1015,8 @@ <h4 id="_get_one_current_evaluation_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Content-Length: 1061
 Content-Type: application/json;charset=UTF-8
-Content-Length: 1009
 
 {
   "id" : "processperformance",
@@ -1031,6 +1053,8 @@ <h4 id="_get_one_current_evaluation_http_response">HTTP response</h4>
   "categories_description" : "[Good (0,67), Neutral (0,33), Bad (0,00)]",
   "hasBN" : false,
   "hasFeedback" : false,
+  "confidence80" : null,
+  "confidence95" : null,
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingFactors" : null
@@ -1149,6 +1173,16 @@ <h4 id="_get_historical_evaluation_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -1236,7 +1270,7 @@ <h4 id="_get_historical_evaluation_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 1013
+Content-Length: 1065
 Content-Type: application/json;charset=UTF-8
 
 [ {
@@ -1274,6 +1308,8 @@ <h4 id="_get_historical_evaluation_http_response">HTTP response</h4>
   "categories_description" : "[Good (0,67), Neutral (0,33), Bad (0,00)]",
   "hasBN" : false,
   "hasFeedback" : false,
+  "confidence80" : null,
+  "confidence95" : null,
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingFactors" : null
@@ -1392,6 +1428,36 @@ <h4 id="_get_prediction_evaluation_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Object</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80.first</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval higher values</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80.second</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval lower values</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Object</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95.first</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval higher values</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95.second</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval lower values</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -1479,7 +1545,7 @@ <h4 id="_get_prediction_evaluation_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 1010
+Content-Length: 1115
 Content-Type: application/json;charset=UTF-8
 
 [ {
@@ -1492,7 +1558,7 @@ <h4 id="_get_prediction_evaluation_http_response">HTTP response</h4>
     "second" : "Good"
   },
   "value_description" : "Good (0.80)",
-  "rationale" : "factors: {...}, formula: ..., value: ..., category: ...",
+  "rationale" : "Forecast",
   "probabilities" : [ {
     "id" : 10,
     "label" : "Good",
@@ -1513,10 +1579,18 @@ <h4 id="_get_prediction_evaluation_http_response">HTTP response</h4>
     "upperThreshold" : 0.0
   } ],
   "date" : [ 2019, 7, 7 ],
-  "datasource" : "Q-Rapdis Dashboard",
+  "datasource" : "Forecast",
   "categories_description" : "[Good (0,67), Neutral (0,33), Bad (0,00)]",
   "hasBN" : false,
   "hasFeedback" : false,
+  "confidence80" : {
+    "first" : 0.97473043,
+    "second" : 0.9745246
+  },
+  "confidence95" : {
+    "first" : 0.9747849,
+    "second" : 0.97447014
+  },
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingFactors" : null
@@ -1708,12 +1782,12 @@ <h4 id="_get_detailed_current_evaluation_http_response">HTTP response</h4>
     "description" : "Performance of the tests",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "forecastingError" : null,
     "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2020-01-29"
+    "formattedDate" : "2020-04-24"
   } ]
 } ]</code></pre>
 </div>
@@ -1933,12 +2007,12 @@ <h4 id="_get_one_detailed_current_evaluation_http_response">HTTP response</h4>
     "description" : "Performance of the tests",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "forecastingError" : null,
     "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2020-01-29"
+    "formattedDate" : "2020-04-24"
   } ]
 } ]</code></pre>
 </div>
@@ -2144,12 +2218,12 @@ <h4 id="_get_detailed_historical_evaluation_http_response">HTTP response</h4>
     "description" : "Performance of the tests",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "forecastingError" : null,
     "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2020-01-29"
+    "formattedDate" : "2020-04-24"
   } ]
 } ]</code></pre>
 </div>
@@ -2377,12 +2451,12 @@ <h4 id="_get_one_detailed_historical_evaluation_http_response">HTTP response</h4
     "description" : "Performance of the tests",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "forecastingError" : null,
     "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2020-01-29"
+    "formattedDate" : "2020-04-24"
   } ]
 } ]</code></pre>
 </div>
@@ -2588,12 +2662,12 @@ <h4 id="_get_detailed_prediction_evaluation_http_response">HTTP response</h4>
     "description" : "Performance of the tests",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "forecastingError" : null,
     "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2020-01-29"
+    "formattedDate" : "2020-04-24"
   } ]
 } ]</code></pre>
 </div>
@@ -2813,12 +2887,12 @@ <h4 id="_get_one_detailed_prediction_evaluation_http_response">HTTP response</h4
     "description" : "Performance of the tests",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "forecastingError" : null,
     "strategicIndicators" : [ "processperformance" ],
-    "formattedDate" : "2020-01-29"
+    "formattedDate" : "2020-04-24"
   } ]
 } ]</code></pre>
 </div>
@@ -3531,6 +3605,16 @@ <h4 id="_simulate_strategic_indicators_assessment_response_fields">Response fiel
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -3618,8 +3702,8 @@ <h4 id="_simulate_strategic_indicators_assessment_http_response">HTTP response</
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 954
 Content-Type: application/json;charset=UTF-8
+Content-Length: 1006
 
 [ {
   "id" : "processperformance",
@@ -3656,6 +3740,8 @@ <h4 id="_simulate_strategic_indicators_assessment_http_response">HTTP response</
   "categories_description" : "",
   "hasBN" : false,
   "hasFeedback" : false,
+  "confidence80" : null,
+  "confidence95" : null,
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingFactors" : null
@@ -3729,6 +3815,11 @@ <h4 id="_get_quality_model_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator identifier</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator name</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].value</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator assessment value</p></td>
@@ -3754,9 +3845,14 @@ <h4 id="_get_quality_model_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Quality factor identifier</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].value</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Quality factor name</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].weightedValue</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Quality factor value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Quality factor weighted value</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].weight</code></p></td>
@@ -3764,6 +3860,11 @@ <h4 id="_get_quality_model_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Quality factor weight in the strategic indicator assessment</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].assessmentValue</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Quality factor assessment value</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].metrics</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Array</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">List with all the metrics composing the quality factor</p></td>
@@ -3774,15 +3875,25 @@ <h4 id="_get_quality_model_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Metric identifier</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].metrics[].value</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].metrics[].name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metric name</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].metrics[].weightedValue</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Metric value</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metric weighted value</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].metrics[].weight</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Metric weight in the computation of the quality factor</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].factors[].metrics[].assessmentValue</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Metric assessment value</p></td>
+</tr>
 </tbody>
 </table>
 </div>
@@ -3791,22 +3902,27 @@ <h4 id="_get_quality_model_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 319
+Content-Length: 459
 Content-Type: application/json;charset=UTF-8
 
 [ {
   "id" : "blocking",
+  "name" : null,
   "value" : "0.8",
   "valueDescription" : "Good (0.8)",
   "color" : "#00ff00",
   "factors" : [ {
     "id" : "blockingcode",
-    "value" : "0.8",
+    "name" : null,
+    "weightedValue" : "0.8",
     "weight" : "1",
+    "assessmentValue" : null,
     "metrics" : [ {
       "id" : "nonblockingfiles",
-      "value" : "0.8",
-      "weight" : "1"
+      "name" : null,
+      "weightedValue" : "0.8",
+      "weight" : "1",
+      "assessmentValue" : null
     } ]
   } ]
 } ]</code></pre>
@@ -4092,7 +4208,7 @@ <h4 id="_get_current_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -4279,7 +4395,7 @@ <h4 id="_get_current_evaluation_for_strategic_indicator_http_response">HTTP resp
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -4444,7 +4560,7 @@ <h4 id="_get_historical_evaluation_2_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -4631,7 +4747,7 @@ <h4 id="_get_historical_evaluation_for_strategic_indicator_http_response">HTTP r
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : null,
     "rationale" : "parameters: {...}, formula: ...",
     "confidence80" : null,
@@ -4824,7 +4940,7 @@ <h4 id="_get_prediction_http_response">HTTP response</h4>
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -5045,7 +5161,7 @@ <h4 id="_get_prediction_for_strategic_indicators_http_response">HTTP response</h
     "description" : "Percentage of tests under the testing duration threshold",
     "value" : 0.8,
     "value_description" : "0,80",
-    "date" : [ 2020, 1, 29 ],
+    "date" : [ 2020, 4, 24 ],
     "datasource" : "Forecast",
     "rationale" : "Forecast",
     "confidence80" : {
@@ -5198,12 +5314,12 @@ <h4 id="_get_all_quality_factors_http_response">HTTP response</h4>
   "description" : "Performance of the tests",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "forecastingError" : null,
   "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2020-01-29"
+  "formattedDate" : "2020-04-24"
 } ]</code></pre>
 </div>
 </div>
@@ -5366,12 +5482,12 @@ <h4 id="_get_one_quality_factor_http_response">HTTP response</h4>
   "description" : "Performance of the tests",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "forecastingError" : null,
   "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2020-01-29"
+  "formattedDate" : "2020-04-24"
 }</code></pre>
 </div>
 </div>
@@ -5550,12 +5666,12 @@ <h4 id="_simulate_quality_factors_assessment_http_response">HTTP response</h4>
   "description" : "Performance of the tests",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "forecastingError" : null,
   "strategicIndicators" : [ "processperformance" ],
-  "formattedDate" : "2020-01-29"
+  "formattedDate" : "2020-04-24"
 } ]</code></pre>
 </div>
 </div>
@@ -5853,7 +5969,7 @@ <h4 id="_get_current_evaluation_3_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -6021,7 +6137,7 @@ <h4 id="_get_single_current_evaluation_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -6189,7 +6305,7 @@ <h4 id="_get_current_evaluation_for_quality_factor_http_response">HTTP response<
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -6343,7 +6459,7 @@ <h4 id="_get_historical_evaluation_3_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -6519,7 +6635,7 @@ <h4 id="_get_single_historical_evaluation_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -6695,7 +6811,7 @@ <h4 id="_get_historical_evaluation_for_quality_factor_http_response">HTTP respon
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : null,
   "rationale" : "parameters: {...}, formula: ...",
   "confidence80" : null,
@@ -6869,7 +6985,7 @@ <h4 id="_get_prediction_2_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : "Forecast",
   "rationale" : "Forecast",
   "confidence80" : {
@@ -7071,7 +7187,7 @@ <h4 id="_get_prediction_for_quality_factor_http_response">HTTP response</h4>
   "description" : "Percentage of tests under the testing duration threshold",
   "value" : 0.8,
   "value_description" : "0,80",
-  "date" : [ 2020, 1, 29 ],
+  "date" : [ 2020, 4, 24 ],
   "datasource" : "Forecast",
   "rationale" : "Forecast",
   "confidence80" : {
@@ -7382,7 +7498,7 @@ <h4 id="_get_all_alerts_http_response">HTTP response</h4>
   "value" : 0.4,
   "threshold" : 0.5,
   "category" : "category",
-  "date" : 1580294291020,
+  "date" : 1587724564167,
   "status" : "NEW",
   "reqAssociat" : true,
   "artefacts" : null
@@ -8178,7 +8294,7 @@ <h4 id="_add_quality_requirement_for_alert_http_response">HTTP response</h4>
 
 {
   "id" : 3,
-  "date" : 1580294290567,
+  "date" : 1587724563641,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -8367,7 +8483,7 @@ <h4 id="_get_all_quality_requirements_http_response">HTTP response</h4>
 
 [ {
   "id" : 3,
-  "date" : 1580294293936,
+  "date" : 1587724567417,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -8382,7 +8498,7 @@ <h4 id="_get_all_quality_requirements_http_response">HTTP response</h4>
     "value" : 0.4,
     "threshold" : 0.5,
     "category" : "category",
-    "date" : 1580294293936,
+    "date" : 1587724567417,
     "status" : "NEW",
     "reqAssociat" : true,
     "artefacts" : null
@@ -8526,7 +8642,7 @@ <h4 id="_add_quality_requirement_http_response">HTTP response</h4>
 
 {
   "id" : 3,
-  "date" : 1580294294046,
+  "date" : 1587724567533,
   "requirement" : "The ratio of files without duplications should be at least 0.8",
   "description" : "The ratio of files without duplications should be at least the given value",
   "goal" : "Improve the quality of the source code",
@@ -9049,7 +9165,7 @@ <h4 id="_get_all_decisions_http_response">HTTP response</h4>
 [ {
   "id" : 2,
   "type" : "ADD",
-  "date" : 1580294291874,
+  "date" : 1587724565107,
   "author" : null,
   "rationale" : "User comments",
   "patternId" : 100,
@@ -9262,7 +9378,7 @@ <h4 id="_get_feedback_for_strategic_indicator_http_response">HTTP response</h4>
 
 [ {
   "strategicIndicatorId" : 1,
-  "date" : "2020-01-29",
+  "date" : "2020-04-24",
   "author" : null,
   "oldValue" : 0.6,
   "newValue" : 0.75
@@ -10342,6 +10458,16 @@ <h4 id="_get_product_evaluation_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -10429,7 +10555,7 @@ <h4 id="_get_product_evaluation_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 953
+Content-Length: 1005
 Content-Type: application/json;charset=UTF-8
 
 [ {
@@ -10467,6 +10593,8 @@ <h4 id="_get_product_evaluation_http_response">HTTP response</h4>
   "categories_description" : "[Good (0,67), Neutral (0,33), Bad (0,00)]",
   "hasBN" : false,
   "hasFeedback" : false,
+  "confidence80" : null,
+  "confidence95" : null,
   "forecastingError" : null,
   "mismatchDays" : 0,
   "missingFactors" : null
@@ -10564,6 +10692,16 @@ <h4 id="_get_product_detailed_evaluation_response_fields">Response fields</h4>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator category</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].second[].confidence80</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 80% confidence interval</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].second[].confidence95</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Strategic indicator forecasting 95% confidence interval</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>[].second[].value_description</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Readable strategic indicator value and category</p></td>
@@ -10651,8 +10789,8 @@ <h4 id="_get_product_detailed_evaluation_http_response">HTTP response</h4>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
-Content-Length: 1073
 Content-Type: application/json;charset=UTF-8
+Content-Length: 1129
 
 [ {
   "first" : "test",
@@ -10691,6 +10829,8 @@ <h4 id="_get_product_detailed_evaluation_http_response">HTTP response</h4>
     "categories_description" : "[Good (0,67), Neutral (0,33), Bad (0,00)]",
     "hasBN" : false,
     "hasFeedback" : false,
+    "confidence80" : null,
+    "confidence95" : null,
     "forecastingError" : null,
     "mismatchDays" : 0,
     "missingFactors" : null
@@ -10783,7 +10923,7 @@ <h4 id="_get_project_milestones_request_parameters">Request parameters</h4>
 <h4 id="_get_project_milestones_curl_request">Curl request</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/milestones?prj=test&amp;date=2020-01-29' -i -X GET</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'http://localhost:8080/api/milestones?prj=test&amp;date=2020-04-24' -i -X GET</code></pre>
 </div>
 </div>
 </div>
@@ -10835,7 +10975,7 @@ <h4 id="_get_project_milestones_http_response">HTTP response</h4>
 Content-Type: application/json;charset=UTF-8
 
 [ {
-  "date" : "2020-02-01",
+  "date" : "2020-04-27",
   "name" : "Version 1.3",
   "description" : "Version 1.3 adding new features",
   "type" : "Release"
@@ -10927,10 +11067,10 @@ <h4 id="_get_project_phases_http_response">HTTP response</h4>
 Content-Length: 156
 
 [ {
-  "dateFrom" : "2020-01-14",
+  "dateFrom" : "2020-04-09",
   "name" : "Development",
   "description" : "Implementation of project functionalities",
-  "dateTo" : "2020-02-13"
+  "dateTo" : "2020-05-09"
 } ]</code></pre>
 </div>
 </div>
@@ -10941,7 +11081,7 @@ <h4 id="_get_project_phases_http_response">HTTP response</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-01-29 11:41:22 +0100
+Last updated 2020-04-24 12:39:16 +0200
 </div>
 </div>
 </body>
diff --git a/sonar-project.properties b/sonar-project.properties
index 8891a310..5cfe689e 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.projectKey=q-rapids_qrapids-dashboard
 
 sonar.projectName=qrapids-dashboard
 
-sonar.projectVersion=1.2
+sonar.projectVersion=1.3
 
 sonar.sources=src/main/java
 sonar.tests=src/test/java
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java
index 18c91eb1..ec2889c2 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/adapters/Forecast.java
@@ -34,6 +34,7 @@ public class Forecast {
     private static final String HORIZON_QUERY = "&horizon=";
     private static final String TECHNIQUE_QUERY = "&technique=";
     private static final String METRIC_QUERY = "&metric=";
+    private static final String STRATEGIC_INDICATOR_QUERY = "&strategic_indicator=";
     private static final String HOST_QUERY = "&host=";
     private static final String PORT_QUERY = "&port=";
     private static final String PATH_QUERY = "&path=";
@@ -118,6 +119,14 @@ public void trainFactorForecast(List<DTOQualityFactor> factors, String freq, Str
         trainForecastRequest(elements, Constants.INDEX_FACTORS, freq, prj, technique);
     }
 
+    public void trainStrategicIndicatorForecast(List<DTOStrategicIndicatorEvaluation> strategicIndicators, String freq, String prj, String technique) {
+        List<String> elements = new ArrayList<>();
+        for (DTOStrategicIndicatorEvaluation si : strategicIndicators) {
+            elements.add(si.getId());
+        }
+        trainForecastRequest(elements, Constants.INDEX_STRATEGIC_INDICATORS, freq, prj, technique);
+    }
+
     private void trainForecastRequest(List<String> elements, String index, String freq, String prj, String technique) {
         if (prefix == null) prefix = "";
         RestTemplate restTemplate = new RestTemplate();
@@ -229,22 +238,19 @@ private void buildMetric(List<DTOMetric> result, JsonArray lower80, JsonArray up
         if (m.getId().equals(id) && lower80.size() == upper80.size() && lower95.size() == upper95.size() && lower80.size() == lower95.size() && lower80.size() == mean.size()) {
             if (lower80.size() > 0) {
                 for (int j = 0; j < lower80.size(); ++j) {
-                    // Avoid predicted values out of range
                     float aux = mean.get(j).getAsFloat();
-                    if (mean.get(j).getAsFloat() > 1) aux = 1;
-                    else if (mean.get(j).getAsFloat() < 0) aux = 0;
                     result.add(new DTOMetric(m.getId(), m.getName(),
                             m.getDescription(),
                             m.getDatasource(),
                             m.getRationale(),
-                            LocalDate.now().plusDays((long) j), aux, Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()), Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat())));
+                            m.getDate().plusDays((long) j + 1), aux, Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()), Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat())));
                 }
             } else {
                 result.add(new DTOMetric(m.getId(), m.getName(),
                         m.getDescription(),
                         m.getDatasource(),
                         m.getRationale(),
-                        LocalDate.now(), null, null, null));
+                        m.getDate().plusDays((long) 1), null, null, null));
             }
         }
     }
@@ -307,6 +313,8 @@ private List<DTOQualityFactor> getDtoQualityFactors(List<DTOQualityFactor> facto
             metricsMatrix.add(new ArrayList<>());
         }
 
+        LocalDate current = factor.get(0).getMetrics().get(0).getDate();
+
         JsonParser parser = new JsonParser();
         JsonArray data = parser.parse(content.toString()).getAsJsonArray();
         for (int i = 0; i < data.size(); ++i) {
@@ -317,7 +325,7 @@ private List<DTOQualityFactor> getDtoQualityFactors(List<DTOQualityFactor> facto
                 getMetricForFactorWithError(metrics, metricsNames, metricsMatrix, object);
             }
             else {
-                getMetricsForFactors(metrics, metricsNames, metricsMatrix, object);
+                getMetricsForFactors(current, metrics, metricsNames, metricsMatrix, object);
             }
         }
 
@@ -327,7 +335,7 @@ private List<DTOQualityFactor> getDtoQualityFactors(List<DTOQualityFactor> facto
         return factor;
     }
 
-    private void getMetricsForFactors(Map<String, ArrayList<Integer>> metrics, Map<String, String> metricsNames, List<List<DTOMetric>> metricsMatrix, JsonObject object) {
+    private void getMetricsForFactors(LocalDate current, Map<String, ArrayList<Integer>> metrics, Map<String, String> metricsNames, List<List<DTOMetric>> metricsMatrix, JsonObject object) {
         //check if json values are null
         JsonArray lower80;
         if (!object.get(LOWER_80).isJsonNull()) lower80 = object.getAsJsonArray(LOWER_80);
@@ -352,25 +360,22 @@ private void getMetricsForFactors(Map<String, ArrayList<Integer>> metrics, Map<S
         String id = object.get(ID).getAsString();
 
         for (Map.Entry<String, ArrayList<Integer>> m : metrics.entrySet()) {
-            buildMetricForFactor(metricsNames, metricsMatrix, lower80, upper80, lower95, upper95, mean, id, m);
+            buildMetricForFactor(metricsNames, metricsMatrix, lower80, upper80, lower95, upper95, mean, id, m, current);
         }
     }
 
-    private void buildMetricForFactor(Map<String, String> metricsNames, List<List<DTOMetric>> metricsMatrix, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, Map.Entry<String, ArrayList<Integer>> m) {
+    private void buildMetricForFactor(Map<String, String> metricsNames, List<List<DTOMetric>> metricsMatrix, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, Map.Entry<String, ArrayList<Integer>> m, LocalDate current) {
         if (m.getKey().equals(id) && lower80.size() == upper80.size() && lower95.size() == upper95.size() && lower80.size() == lower95.size() && lower80.size() == mean.size()) {
             if (lower80.size() > 0) {
                 for (int j = 0; j < lower80.size(); ++j) {
-                    // Avoid predicted values out of range
                     float aux = mean.get(j).getAsFloat();
-                    if (mean.get(j).getAsFloat() > 1) aux = 1;
-                    else if (mean.get(j).getAsFloat() < 0) aux = 0;
                     for (Integer index : m.getValue())
                         metricsMatrix.get(index).add(new DTOMetric(m.getKey(),
                                 metricsNames.get(m.getKey()),
                                 "",
                                 FORECAST_SOURCE,
                                 FORECAST_SOURCE,
-                                LocalDate.now().plusDays((long) j), aux, Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()), Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat())));
+                                current.plusDays((long) j + 1), aux, Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()), Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat())));
                 }
             } else {
                 for (Integer index : m.getValue())
@@ -379,7 +384,7 @@ private void buildMetricForFactor(Map<String, String> metricsNames, List<List<DT
                             "",
                             FORECAST_SOURCE,
                             FORECAST_SOURCE,
-                            LocalDate.now(), null, null, null));
+                            current.plusDays((long) 1), null, null, null));
             }
         }
     }
@@ -458,6 +463,9 @@ private List<DTODetailedStrategicIndicator> getDtoDetailedStrategicIndicators(Li
             factorsMatrix.add(new ArrayList<>());
         }
 
+        // get current date
+        LocalDate current = dsi.get(0).getDate();
+
         JsonParser parser = new JsonParser();
         JsonArray data = parser.parse(content.toString()).getAsJsonArray();
         for (int i = 0; i < data.size(); ++i) {
@@ -467,7 +475,7 @@ private List<DTODetailedStrategicIndicator> getDtoDetailedStrategicIndicators(Li
                 getFactorWithError(factors, factorsNames, factorsMatrix, object);
             }
             else {
-                getFactors(factors, factorsNames, factorsMatrix, object);
+                getFactors(current, factors, factorsNames, factorsMatrix, object);
             }
         }
 
@@ -477,7 +485,7 @@ private List<DTODetailedStrategicIndicator> getDtoDetailedStrategicIndicators(Li
         return dsi;
     }
 
-    private void getFactors(Map<String, ArrayList<Integer>> factors, Map<String, String> factorsNames, List<List<DTOFactor>> factorsMatrix, JsonObject object) {
+    private void getFactors(LocalDate current, Map<String, ArrayList<Integer>> factors, Map<String, String> factorsNames, List<List<DTOFactor>> factorsMatrix, JsonObject object) {
         //check if json values are null
         JsonArray lower80;
         if (!object.get(LOWER_80).isJsonNull()) lower80 = object.getAsJsonArray(LOWER_80);
@@ -502,26 +510,23 @@ private void getFactors(Map<String, ArrayList<Integer>> factors, Map<String, Str
         String id = object.get(ID).getAsString();
 
         for (Map.Entry<String, ArrayList<Integer>> m : factors.entrySet()) {
-            buildFactor(factorsNames, factorsMatrix, lower80, upper80, lower95, upper95, mean, id, m);
+            buildFactor(factorsNames, factorsMatrix, lower80, upper80, lower95, upper95, mean, id, m, current);
         }
     }
 
-    private void buildFactor(Map<String, String> factorsNames, List<List<DTOFactor>> factorsMatrix, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, Map.Entry<String, ArrayList<Integer>> m) {
+    private void buildFactor(Map<String, String> factorsNames, List<List<DTOFactor>> factorsMatrix, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, Map.Entry<String, ArrayList<Integer>> m, LocalDate current) {
         if (m.getKey().equals(id) && lower80.size() == upper80.size() && lower95.size() == upper95.size() && lower80.size() == lower95.size() && lower80.size() == mean.size()) {
             if (lower80.size() > 0) {
                 for (int j = 0; j < lower80.size(); ++j) {
-                    // Avoid predicted values out of range
                     float aux = mean.get(j).getAsFloat();
-                    if (mean.get(j).getAsFloat() > 1) aux = 1;
-                    else if (mean.get(j).getAsFloat() < 0) aux = 0;
                     for (Integer index : m.getValue())
                         factorsMatrix.get(index).add(new DTOFactor(m.getKey(), factorsNames.get(m.getKey()), "",
-                                aux, LocalDate.now().plusDays((long) j), FORECAST_SOURCE, FORECAST_SOURCE, null));
+                                aux, current.plusDays((long) j + 1), FORECAST_SOURCE, FORECAST_SOURCE, null));
                 }
             } else {
                 for (Integer index : m.getValue())
                     factorsMatrix.get(index).add(new DTOFactor(m.getKey(), factorsNames.get(m.getKey()), "",
-                            null, LocalDate.now(), FORECAST_SOURCE, FORECAST_SOURCE, null));
+                            null, current.plusDays((long) 1), FORECAST_SOURCE, FORECAST_SOURCE, null));
             }
         }
     }
@@ -552,7 +557,139 @@ private void buildFactorsForStrategicIndicator(List<DTODetailedStrategicIndicato
         }
     }
 
-    public List<DTOStrategicIndicatorEvaluation> ForecastSI(String technique, String freq, String horizon, String prj) throws IOException {
+    public List<DTOStrategicIndicatorEvaluation> ForecastSI(List<DTOStrategicIndicatorEvaluation> si,String technique, String freq, String horizon, String prj) throws IOException {
+        StringBuffer urlString = new StringBuffer(url + "/api/StrategicIndicators/Forecast?index_strategic_indicators=");
+        if (prefix == null) prefix = "";
+        urlString.append(URLEncoder.encode(prefix + Constants.INDEX_STRATEGIC_INDICATORS + "." + prj, UTF_8)).append(FREQUENCY_QUERY).append(URLEncoder.encode(freq, UTF_8));
+        urlString.append(HORIZON_QUERY).append(URLEncoder.encode(horizon, UTF_8));
+        urlString.append(TECHNIQUE_QUERY).append(URLEncoder.encode(technique, UTF_8));
+        for(DTOStrategicIndicatorEvaluation s : si) {
+            urlString.append(STRATEGIC_INDICATOR_QUERY).append(URLEncoder.encode(s.getId(), UTF_8));
+        }
+        urlString.append(HOST_QUERY).append(URLEncoder.encode(connection.getIp(), UTF_8));
+        urlString.append(PORT_QUERY).append(URLEncoder.encode(String.valueOf(connection.getPort()), UTF_8));
+        urlString.append(PATH_QUERY).append(URLEncoder.encode(path, UTF_8));
+        urlString.append(USER_QUERY).append(URLEncoder.encode(connection.getUsername(), UTF_8));
+        urlString.append(PWD_QUERY).append(URLEncoder.encode(connection.getPassword(), UTF_8));
+        URL url = new URL(urlString.toString());
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        con.setRequestMethod(GET);
+
+        con.setRequestProperty(CONTENT_TYPE, APPLICATION_JSON);
+
+        int status = con.getResponseCode();
+        if (status == 200) {
+            return getStrategicIndicatorEvaluation(si, con);
+        }
+        return null;
+    }
+
+    private List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorEvaluation(List<DTOStrategicIndicatorEvaluation> si, HttpURLConnection con) throws IOException {
+        BufferedReader in = new BufferedReader(
+                new InputStreamReader(con.getInputStream()));
+        String inputLine;
+        StringBuffer content = new StringBuffer();
+        while ((inputLine = in.readLine()) != null) {
+            content.append(inputLine);
+        }
+        in.close();
+        con.disconnect();
+
+        List<DTOStrategicIndicatorEvaluation> result = new ArrayList<>();
+
+        JsonParser parser = new JsonParser();
+        JsonArray data = parser.parse(content.toString()).getAsJsonArray();
+        for (int i = 0; i < data.size(); ++i) {
+            JsonObject object = data.get(i).getAsJsonObject();
+
+            //check if error occurred
+            if (!object.get(ERROR).isJsonNull()) {
+                getStrategicIndicatorWithError(si, result, object);
+            }
+            else {
+                getStrategicIndicators(si, result, object);
+            }
+        }
+        return result;
+    }
+
+    private void getStrategicIndicators(List<DTOStrategicIndicatorEvaluation> si, List<DTOStrategicIndicatorEvaluation> result, JsonObject object) {
+        //check if json values are null
+        JsonArray lower80;
+        if (!object.get(LOWER_80).isJsonNull()) lower80 = object.getAsJsonArray(LOWER_80);
+        else lower80 = new JsonArray();
+
+        JsonArray upper80;
+        if (!object.get(UPPER_80).isJsonNull()) upper80 = object.getAsJsonArray(UPPER_80);
+        else upper80 = new JsonArray();
+
+        JsonArray lower95;
+        if (!object.get(LOWER_95).isJsonNull()) lower95 = object.getAsJsonArray(LOWER_95);
+        else lower95 = new JsonArray();
+
+        JsonArray upper95;
+        if (!object.get(UPPER_95).isJsonNull()) upper95 = object.getAsJsonArray(UPPER_95);
+        else upper95 = new JsonArray();
+
+        JsonArray mean;
+        if (!object.get(MEAN).isJsonNull()) mean = object.getAsJsonArray(MEAN);
+        else mean = new JsonArray();
+
+        String id = object.get(ID).getAsString();
+
+        for (DTOStrategicIndicatorEvaluation s : si) {
+            buildStrategicIndicator(result, lower80, upper80, lower95, upper95, mean, id, s);
+        }
+    }
+
+    private void buildStrategicIndicator(List<DTOStrategicIndicatorEvaluation> result, JsonArray lower80, JsonArray upper80, JsonArray lower95, JsonArray upper95, JsonArray mean, String id, DTOStrategicIndicatorEvaluation s) {
+        if (s.getId().equals(id) && lower80.size() == upper80.size() && lower95.size() == upper95.size() && lower80.size() == lower95.size() && lower80.size() == mean.size()) {
+            if (lower80.size() > 0) {
+                for (int j = 0; j < lower80.size(); ++j) {
+                    float aux = mean.get(j).getAsFloat();
+                    result.add(new DTOStrategicIndicatorEvaluation(s.getId(),
+                            s.getName(),
+                            s.getDescription(),
+                            Pair.of(aux, strategicIndicatorsController.getLabel(aux)),
+                            Pair.of(upper80.get(j).getAsFloat(), lower80.get(j).getAsFloat()),
+                            Pair.of(upper95.get(j).getAsFloat(), lower95.get(j).getAsFloat()),
+                            FORECAST_SOURCE,
+                            strategicIndicatorsController.getCategories(),
+                            s.getDate().plusDays((long) j + 1),
+                            s.getDatasource(),
+                            s.getDbId(),
+                            strategicIndicatorsController.getCategories().toString(),
+                            s.isHasBN()));
+                }
+            } else {
+                result.add (new DTOStrategicIndicatorEvaluation(s.getId(),
+                        s.getName(),
+                        s.getDescription(),
+                        null,
+                        null,
+                        null,
+                        "",
+                        strategicIndicatorsController.getCategories(),
+                        s.getDate().plusDays((long) 1),
+                        s.getDatasource(),
+                        s.getDbId(),
+                        strategicIndicatorsController.getCategories().toString(),
+                        s.isHasBN()));
+            }
+        }
+    }
+
+    private void getStrategicIndicatorWithError(List<DTOStrategicIndicatorEvaluation> si, List<DTOStrategicIndicatorEvaluation> result, JsonObject object) {
+        String error = object.get(ERROR).getAsString();
+        String id = object.get(ID).getAsString();
+        for (DTOStrategicIndicatorEvaluation s : si) {
+            if (s.getId().equals(id)) {
+                result.add(new DTOStrategicIndicatorEvaluation(id, s.getName(), error));
+            }
+        }
+    }
+
+    public List<DTOStrategicIndicatorEvaluation> ForecastSIDeprecated(String technique, String freq, String horizon, String prj) throws IOException {
         List<DTODetailedStrategicIndicator> dsis = ForecastDSI(qmadsi.CurrentEvaluation(null, prj, true), technique, freq, horizon, prj);
         List<DTOStrategicIndicatorEvaluation> result = new ArrayList<>();
         String categoriesDescription = strategicIndicatorsController.getCategories().toString();
diff --git a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java
index b4139e28..548c9a46 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsController.java
@@ -227,8 +227,8 @@ public List<DTODetailedStrategicIndicator> getSingleDetailedStrategicIndicatorsH
         return qmaDetailedStrategicIndicators.HistoricalData(strategicIndicatorId, from, to, projectExternalId);
     }
 
-    public List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorsPrediction (String technique, String freq, String horizon, String projectExternalId) throws IOException, ElasticsearchStatusException {
-        return qmaForecast.ForecastSI(technique, freq, horizon, projectExternalId);
+    public List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorsPrediction (List<DTOStrategicIndicatorEvaluation> si, String technique, String freq, String horizon, String projectExternalId) throws IOException, ElasticsearchStatusException {
+        return qmaForecast.ForecastSI(si,technique, freq, horizon, projectExternalId);
     }
 
     public List<DTODetailedStrategicIndicator> getDetailedStrategicIndicatorsPrediction (List<DTODetailedStrategicIndicator> currentEvaluation, String technique, String freq, String horizon, String projectExternalId) throws IOException, ElasticsearchStatusException {
@@ -242,12 +242,15 @@ public void trainForecastModelsAllProjects(String technique) throws IOException,
         }
     }
 
-    public void trainForecastModelsSingleProject(String project, String technique) throws IOException {
+    public void trainForecastModelsSingleProject(String project, String technique) throws IOException, CategoriesException {
         List<DTOMetric> metrics = metricsController.getAllMetricsCurrentEvaluation(project);
         qmaForecast.trainMetricForecast(metrics, "7", project, technique);
 
         List<DTOQualityFactor> factors = qualityFactorsController.getAllFactorsWithMetricsCurrentEvaluation(project);
         qmaForecast.trainFactorForecast(factors, "7", project, technique);
+
+        List<DTOStrategicIndicatorEvaluation> strategicIndicators = getAllStrategicIndicatorsCurrentEvaluation(project);
+        qmaForecast.trainStrategicIndicatorForecast(strategicIndicators, "7", project, technique);
     }
 
     public boolean assessStrategicIndicators(String projectExternalId, LocalDate dateFrom) throws IOException, CategoriesException, ProjectNotFoundException {
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOStrategicIndicatorEvaluation.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOStrategicIndicatorEvaluation.java
index 0d324df1..51c7f720 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOStrategicIndicatorEvaluation.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/dto/DTOStrategicIndicatorEvaluation.java
@@ -27,6 +27,8 @@ public class DTOStrategicIndicatorEvaluation {
     private String categories_description;
     private boolean hasBN;
     private boolean hasFeedback;
+    private Pair<Float, Float> confidence80;
+    private Pair<Float, Float> confidence95;
     private String forecastingError;
     private int mismatchDays;
     private List<String> missingFactors;
@@ -58,6 +60,22 @@ public DTOStrategicIndicatorEvaluation(String id, String name, String descriptio
         setHasBN(hasBN);
     }
 
+    public DTOStrategicIndicatorEvaluation(String id, String name, String description, Pair<Float, String> value, Pair<Float, Float> confidence80, Pair<Float, Float> confidence95, String rationale, List<DTOSIAssessment> probabilities, LocalDate date, String datasource, Long dbId, String categories, boolean hasBN) {
+        setId(id);
+        setName(name);
+        setDescription(description);
+        setValue(value);
+        setConfidence80(confidence80);
+        setConfidence95(confidence95);
+        setRationale(rationale);
+        setProbabilities(probabilities);
+        setDate(date);
+        setDbId(dbId);
+        setDatasource(datasource);
+        setCategories_description(categories);
+        setHasBN(hasBN);
+    }
+
     public DTOStrategicIndicatorEvaluation(String id, String name, String forecastingError) {
         this.id = id;
         this.name = name;
@@ -102,7 +120,6 @@ public void setDescription(String description) {
             this.description = description;
     }
 
-
     public Pair<Float, String> getValue() {
         return value;
     }
@@ -208,4 +225,20 @@ public List<String> getMissingFactors() {
     public void setMissingFactors(List<String> missingFactors) {
         this.missingFactors = missingFactors;
     }
+
+    public void setConfidence80(Pair<Float, Float> confidence80) {
+        this.confidence80 = confidence80;
+    }
+
+    public Pair<Float, Float> getConfidence80() {
+        return confidence80;
+    }
+
+    public void setConfidence95(Pair<Float, Float> confidence95) {
+        this.confidence95 = confidence95;
+    }
+
+    public Pair<Float, Float> getConfidence95() {
+        return confidence95;
+    }
 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java
index f0389d81..0ff99be8 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/Metrics.java
@@ -109,10 +109,10 @@ public List<DTOMetric> getHistoricalDataForMetric(@RequestParam(value = "prj") S
 
     @RequestMapping("/api/metrics/prediction")
     @ResponseStatus(HttpStatus.OK)
-    public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") String prj, @RequestParam("technique") String techinique, @RequestParam("horizon") String horizon) throws IOException {
+    public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") String prj, @RequestParam("technique") String technique, @RequestParam("horizon") String horizon) throws IOException {
         try {
             List<DTOMetric> currentEvaluation = metricsController.getAllMetricsCurrentEvaluation(prj);
-            return metricsController.getMetricsPrediction(currentEvaluation, prj, techinique, "7", horizon);
+            return metricsController.getMetricsPrediction(currentEvaluation, prj, technique, "7", horizon);
         } catch (ElasticsearchStatusException e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, Messages.PROJECT_NOT_FOUND);
@@ -122,4 +122,16 @@ public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") Str
         }
     }
 
+    @GetMapping("/api/metrics/currentDate")
+    @ResponseStatus(HttpStatus.OK)
+    public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
+        try {
+            List<DTOMetric> metrics = metricsController.getAllMetricsCurrentEvaluation(prj);
+            return metrics.get(0).getDate();
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        // if the response is null
+        return null;
+    }
 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactors.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactors.java
index 91331bb7..29f545c4 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactors.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactors.java
@@ -3,10 +3,7 @@
 import com.upc.gessi.qrapids.app.domain.controllers.MetricsController;
 import com.upc.gessi.qrapids.app.domain.controllers.QualityFactorsController;
 import com.upc.gessi.qrapids.app.domain.models.QFCategory;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOCategoryThreshold;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOFactor;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOMetric;
-import com.upc.gessi.qrapids.app.presentation.rest.dto.DTOQualityFactor;
+import com.upc.gessi.qrapids.app.presentation.rest.dto.*;
 import com.upc.gessi.qrapids.app.domain.exceptions.CategoriesException;
 import com.upc.gessi.qrapids.app.presentation.rest.services.helpers.Messages;
 import org.elasticsearch.ElasticsearchStatusException;
@@ -189,4 +186,17 @@ public List<DTOMetric> getMetricsPredictionData(@RequestParam(value = "prj") Str
             throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, Messages.INTERNAL_SERVER_ERROR + e.getMessage());
         }
     }
+
+    @GetMapping("/api/qualityFactors/currentDate")
+    @ResponseStatus(HttpStatus.OK)
+    public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
+        try {
+            List<DTOFactor> qfs = qualityFactorsController.getAllFactorsEvaluation(prj);
+            return qfs.get(0).getDate();
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        // if the response is null
+        return null;
+    }
 }
diff --git a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicators.java b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicators.java
index 7f7831d6..2cf9dc3e 100644
--- a/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicators.java
+++ b/src/main/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicators.java
@@ -186,11 +186,12 @@ List<DTOQualityFactor> getQualityFactorsHistoricalData(@RequestParam(value = "pr
     @ResponseStatus(HttpStatus.OK)
     public List<DTOStrategicIndicatorEvaluation> getStrategicIndicatorsPrediction(@RequestParam(value = "prj", required=false) String prj, @RequestParam("technique") String technique, @RequestParam("horizon") String horizon) {
         try {
-            return strategicIndicatorsController.getStrategicIndicatorsPrediction(technique, "7", horizon, prj);
+            List<DTOStrategicIndicatorEvaluation> currentEvaluation = strategicIndicatorsController.getAllStrategicIndicatorsCurrentEvaluation(prj);
+            return strategicIndicatorsController.getStrategicIndicatorsPrediction(currentEvaluation, technique, "7", horizon, prj);
         } catch (ElasticsearchStatusException e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, Messages.PROJECT_NOT_FOUND);
-        } catch (IOException e) {
+        } catch (IOException | CategoriesException  e) {
             logger.error(e.getMessage(), e);
             throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, Messages.INTERNAL_SERVER_ERROR + e.getMessage());
         }
@@ -392,7 +393,8 @@ public void newSICategories (@RequestBody List<Map<String, String>> categories)
     private enum TrainType {
         NONE, ONE, ALL
     }
-//TODO: assessSI
+
+    //TODO: assessSI
     @RequestMapping("/api/assessStrategicIndicators")
     @ResponseStatus(HttpStatus.OK)
     public void assesStrategicIndicatorsLegacy(@RequestParam(value = "prj", required=false) String prj,
@@ -492,4 +494,17 @@ public List<DTORelationsSI> getQualityModel(@RequestParam("prj") String prj, @Re
     public List<String> getForecastTechniques() {
         return strategicIndicatorsController.getForecastTechniques();
     }
+
+    @GetMapping("/api/strategicIndicators/currentDate")
+    @ResponseStatus(HttpStatus.OK)
+    public LocalDate getcurrentDate(@RequestParam(value = "prj") String prj) {
+        try {
+            List<DTOStrategicIndicatorEvaluation> si = strategicIndicatorsController.getAllStrategicIndicatorsCurrentEvaluation(prj);
+            return si.get(0).getDate();
+        } catch (IOException | CategoriesException e) {
+            logger.error(e.getMessage(), e);
+        }
+        // if the response is null
+        return null;
+    }
 }
diff --git a/src/main/resources/static/js/navScript.js b/src/main/resources/static/js/navScript.js
index de4ba7e9..dbb21a39 100644
--- a/src/main/resources/static/js/navScript.js
+++ b/src/main/resources/static/js/navScript.js
@@ -302,7 +302,13 @@ function disableViewModeAndTimeOption () {
 
 if (assessment === "QualityModel") $("#Assessment").attr("href", serverUrl + "/" + assessment + qmMode);
 else if ( assessment === "Phases" ) $("#Assessment").attr("href", serverUrl + "/" + assessment);
-else if (assessment === "DetailedStrategicIndicators" || assessment === "QualityFactors" ) $("#Assessment").attr("href", serverUrl + "/" + assessment  + "/" + time + viewMode + representationMode);
+else if (assessment === "DetailedStrategicIndicators" || assessment === "QualityFactors" ) {
+    if (time == "Current" && viewMode == "Chart") {
+        $("#Assessment").attr("href", serverUrl + "/" + assessment + "/" + time + viewMode + representationMode);
+    } else {
+        $("#Assessment").attr("href", serverUrl + "/" + assessment  + "/" + time + viewMode);
+    }
+}
 else $("#Assessment").attr("href", serverUrl + "/" + assessment  + "/" + time + viewMode);
 
 $("#Prediction").attr("href", serverUrl + "/" + prediction + "/" + "PredictionChart");
@@ -467,10 +473,19 @@ function navBack(toDetailed) {
             urlNav = "../QualityFactors/PredictionChart";
     }
     else {
-        if (toDetailed)
-            urlNav = "../DetailedStrategicIndicators/" + time + viewMode + representationMode;
-        else
-            urlNav = "../QualityFactors/" + time + viewMode + representationMode;
+        if (toDetailed) {
+            if (time == 'Current' && viewMode == 'Chart') {
+                urlNav = "../DetailedStrategicIndicators/" + time + viewMode + representationMode;
+            } else {
+                urlNav = "../DetailedStrategicIndicators/" + time + viewMode;
+            }
+        } else {
+            if (time == 'Current' && viewMode == 'Chart') {
+                urlNav = "../QualityFactors/" + time + viewMode + representationMode;
+            } else {
+                urlNav = "../QualityFactors/" + time + viewMode;
+            }
+        }
     }
     if (siid.length !== 0 && si.length !== 0) {
         urlNav = urlNav + "?id=" + siid + "&name=" + si;
diff --git a/src/main/resources/static/js/parseDataDetailedSICurrent.js b/src/main/resources/static/js/parseDataDetailedSICurrent.js
index 0bdc39ab..e5381852 100644
--- a/src/main/resources/static/js/parseDataDetailedSICurrent.js
+++ b/src/main/resources/static/js/parseDataDetailedSICurrent.js
@@ -19,8 +19,6 @@ function getData() {
     values = [];
     categories = [];
 
-    getCategories();
-
     //get data from API
     jQuery.ajax({
         dataType: "json",
@@ -83,25 +81,19 @@ function getData() {
                 warnings.push(messages);
             }
             $("#assessmentDate").text(assessmentDate.toLocaleDateString());
-            drawChart();
+            getFactorsCategories();
         }
     });
 }
 
-function getCategories() {
-    var serverUrl = sessionStorage.getItem("serverUrl");
-    var url = "/api/qualityFactors/categories";
-    if (serverUrl) {
-        url = serverUrl + url;
-    }
-    $.getJSON(url).then (function(cat) {
-        for (var i = 0; i < cat.length; i++) {
-            categories.push({
-                name: cat[i].name,
-                color: cat[i].color,
-                upperThreshold: cat[i].upperThreshold,
-            });
+function getFactorsCategories() {
+    jQuery.ajax({
+        url: "../api/qualityFactors/categories",
+        type: "GET",
+        async: true,
+        success: function (response) {
+            categories = response;
+            drawChart();
         }
-        console.log(categories);
     });
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/parseDataDetailedSIPrediction.js b/src/main/resources/static/js/parseDataDetailedSIPrediction.js
index ba7cd7bd..809ff46f 100644
--- a/src/main/resources/static/js/parseDataDetailedSIPrediction.js
+++ b/src/main/resources/static/js/parseDataDetailedSIPrediction.js
@@ -1,6 +1,8 @@
 var isdsi = true;
+var isqf = false;
 
-var url = parseURLSimple("../api/strategicIndicators/qualityFactors/prediction");
+var url_hist = parseURLSimple("../api/strategicIndicators/qualityFactors/historical");
+var url_pred = parseURLSimple("../api/strategicIndicators/qualityFactors/prediction");
 
 //initialize data vectors
 var texts = [];
@@ -20,17 +22,18 @@ function getData() {
     value = [];
     errors = [];
     var technique = $("#selectedTechnique").text();
-    var date1 = new Date($('#datepickerFrom').val());
-    var date2 = new Date($('#datepickerTo').val());
-    var timeDiff = date2.getTime() - date1.getTime();
+    var dateFrom = new Date($('#datepickerFrom').val());
+    var dateC = new Date($('#datepickerCurrentDate').val());
+    var dateTo = new Date($('#datepickerTo').val());
+    var timeDiff = dateTo.getTime() - dateC.getTime();
     var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
     if (diffDays < 1) {
         alert('To date has to be bigger than from date');
     } else {
-        //get data from API
+        //get predicted data from API
         jQuery.ajax({
             dataType: "json",
-            url: url,
+            url: url_pred,
             data: {
                 "technique": technique,
                 "horizon": diffDays
@@ -39,50 +42,97 @@ function getData() {
             type: "GET",
             async: true,
             success: function (data) {
-                console.log(data);
-                for (i = 0; i < data.length; ++i) {
-                    for (i = 0; i < data.length; ++i) {
-                        //for each dsi save name to texts vector and id to ids vector
-                        if (data[i].factors.length > 0) {
-                            texts.push(data[i].name);
-                            ids.push(data[i].id);
+                //get historical data from API
+                jQuery.ajax({
+                    dataType: "json",
+                    url: url_hist,
+                    data: {
+                        "from": parseDate(dateFrom),
+                        "to": parseDate(dateC)
+                    },
+                    cache: false,
+                    type: "GET",
+                    async: true,
+                    success: function (data_hist) {
+                        // generate historical serie of values
+                        for (var i = 0; i < data_hist.length; ++i) {
+                            // order data
+                            data_hist[i].factors.sort((a,b) => (a.name > b.name) ? 1 : ((b.name > a.name) ? -1 : 0));
+                            //for each dsi save name to texts vector and id to ids vector
+                            if (data_hist[i].factors.length > 0) {
+                                texts.push(data_hist[i].name);
+                                ids.push(data_hist[i].id);
 
-                            value.push([[]]);
-                            last = data[i].factors[0].id;
-                            labels.push([data[i].factors[0].name]);
-                            errors.push([data[i].factors[0].forecastingError]);
-                            k = 0;
-                            for (j = 0; j < data[i].factors.length; ++j) {
-                                //check if we are still on the same factor
-                                if (last != data[i].factors[j].id) {
-                                    labels[i].push(data[i].factors[j].name);
-                                    last = data[i].factors[j].id;
-                                    ++k;
-                                    value[i].push([]);
-                                    errors[i].push(data[i].factors[j].forecastingError);
-                                }
-                                //push date and value to values vector
-                                if (!isNaN(data[i].factors[j].value)) {
-                                    if (data[i].factors[j].value !== null) {
+                                value.push([[]]);
+                                last = data_hist[i].factors[0].id;
+                                labels.push([data_hist[i].factors[0].name]);
+                                k = 0;
+                                for (j = 0; j < data_hist[i].factors.length; ++j) {
+                                    //check if we are still on the same factor
+                                    if (last != data_hist[i].factors[j].id) {
+                                        labels[i].push(data_hist[i].factors[j].name);
+                                        last = data_hist[i].factors[j].id;
+                                        ++k;
+                                        value[i].push([]);
+                                    }
+                                    //push date and value to values vector
+                                    if (!isNaN(data_hist[i].factors[j].value))
+                                    {
                                         value[i][k].push(
                                             {
-                                                x: data[i].factors[j].date,
-                                                y: data[i].factors[j].value
+                                                x: data_hist[i].factors[j].date,
+                                                y: data_hist[i].factors[j].value
                                             }
                                         );
                                     }
                                 }
+                            } else {
+                                data.splice(i, 1);
+                                --i;
                             }
-                        } else {
-                            data.splice(i, 1);
-                            --i;
                         }
+                        // add prediction series generated
+                        for (i = 0; i < data.length; ++i) {
+                            // order data
+                            data[i].factors.sort((a,b) => (a.name > b.name) ? 1 : ((b.name > a.name) ? -1 : 0));
+                            //for each dsi save name to texts vector and id to ids vector
+                            if (data[i].factors.length > 0) {
+                                value[i].push([]);
+                                last = data[i].factors[0].id;
+                                labels[i].push("Predicted "+data[i].factors[0].name);
+                                errors.push([data[i].factors[0].forecastingError]);
+                                k = value[i].length-1;
+                                for (j = 0; j < data[i].factors.length; ++j) {
+                                    //check if we are still on the same factor
+                                    if (last != data[i].factors[j].id) {
+                                        labels[i].push("Predicted "+data[i].factors[j].name);
+                                        last = data[i].factors[j].id;
+                                        ++k;
+                                        value[i].push([]);
+                                        errors[i].push(data[i].factors[j].forecastingError);
+                                    }
+                                    //push date and value to values vector
+                                    if (!isNaN(data[i].factors[j].value)) {
+                                        if (data[i].factors[j].value !== null) {
+                                            value[i][k].push(
+                                                {
+                                                    x: data[i].factors[j].date,
+                                                    y: data[i].factors[j].value
+                                                }
+                                            );
+                                        }
+                                    }
+                                }
+                            } else {
+                                data.splice(i, 1);
+                                --i;
+                            }
+                        }
+                        document.getElementById("loader").style.display = "none";
+                        document.getElementById("chartContainer").style.display = "block";
+                        getFactorsCategories();
                     }
-                }
-                document.getElementById("loader").style.display = "none";
-                document.getElementById("chartContainer").style.display = "block";
-                getFactorsCategories();
-                drawChart();
+                });
             },
             error: function (xhr, ajaxOptions, thrownError) {
                 document.getElementById("loader").style.display = "none";
@@ -91,9 +141,6 @@ function getData() {
             }
         });
     }
-    console.log(texts);
-    console.log(labels);
-    console.log(value);
 }
 
 function getFactorsCategories () {
diff --git a/src/main/resources/static/js/parseDataMetricsPrediction.js b/src/main/resources/static/js/parseDataMetricsPrediction.js
index a1784374..4d0eaf00 100644
--- a/src/main/resources/static/js/parseDataMetricsPrediction.js
+++ b/src/main/resources/static/js/parseDataMetricsPrediction.js
@@ -2,21 +2,20 @@ var isSi = false;
 var isdsi = false;
 var isqf = false;
 
-var url;
+var urlpred; // to get prediction data
+var urlhist; // to get historical data
 if (getParameterByName('id').length !== 0) {
-    url = parseURLMetrics("../api/qualityFactors/metrics/prediction");
+    urlpred = parseURLMetrics("../api/qualityFactors/metrics/prediction");
+    urlhist = parseURLMetrics("../api/qualityFactors/metrics/historical");
 } else {
-    url = parseURLMetrics("../api/metrics/prediction");
+    urlpred = parseURLMetrics("../api/metrics/prediction");
+    urlhist = parseURLMetrics("../api/metrics/historical");
 }
 
 //initialize data vectors
 var texts = [];
 var labels = [];
 var value = [];
-//var lower80 = [];
-//var lower95 = [];
-//var upper80 = [];
-//var upper95 = [];
 var errors = [];
 var categories = [];
 
@@ -26,23 +25,21 @@ function getData() {
     texts = [];
     labels = [];
     value = [];
-    //lower80 = [];
-    //lower95 = [];
-    //upper80 = [];
-    //upper95 = [];
     errors = [];
+    // use configured datapickers for forecast
     var technique = $("#selectedTechnique").text();
-    var date1 = new Date($('#datepickerFrom').val());
-    var date2 = new Date($('#datepickerTo').val());
-    var timeDiff = date2.getTime() - date1.getTime();
+    var dateFrom = new Date($('#datepickerFrom').val());
+    var dateC = new Date($('#datepickerCurrentDate').val());
+    var dateTo = new Date($('#datepickerTo').val());
+    var timeDiff = dateTo.getTime() - dateC.getTime();
     var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
     if (diffDays < 1) {
         alert('To date has to be bigger than from date');
     } else {
-        //get data from API
+        //get predicted data from API
         jQuery.ajax({
             dataType: "json",
-            url: url,
+            url: urlpred,
             data: {
                 "technique": technique,
                 "horizon": diffDays
@@ -51,87 +48,123 @@ function getData() {
             type: "GET",
             async: true,
             success: function (data) {
-                j = 0;
-                var line = [];
-                //var line80l = [];
-                //var line80u = [];
-                //var line95l = [];
-                //var line95u = [];
-                if (data[j]) {
-                    last = data[j].id;
-                    texts.push(data[j].name);
-                    labels.push([data[j].name]);
-                    errors.push([data[j].forecastingError]);
-                }
-                while (data[j]) {
-                    //check if we are still on the same metric
-                    if (data[j].id !== last) {
-                        value.push([line]);
-                        //lower80.push(line80l);
-                        //upper80.push(line80u);
-                        //lower95.push(line95l);
-                        //upper95.push(line95u);
-                        line = [];
-                        //line80l = [];
-                        //line80u = [];
-                        //line95l = [];
-                        //line95u = [];
-                        last = data[j].id;
-                        texts.push(data[j].name);
-                        labels.push([data[j].name]);
-                        errors.push([data[j].forecastingError]);
-                    }
-                    //push date and value to line vector
-                    if (!isNaN(data[j].value)) {
-                        if (data[j].value !== null) {
-                            line.push({
-                                x: data[j].date,
-                                y: data[j].value
-                            });
-                            // line80l.push({
-                            //     x: data[j].date,
-                            //     y: data[j].confidence80.second
-                            // });
-                            // line80u.push({
-                            //     x: data[j].date,
-                            //     y: data[j].confidence80.first
-                            // });
-                            // line95l.push({
-                            //     x: data[j].date,
-                            //     y: data[j].confidence95.second
-                            // });
-                            // line95u.push({
-                            //     x: data[j].date,
-                            //     y: data[j].confidence95.first
-                            // });
+                //get historical data from API
+                jQuery.ajax({
+                    dataType: "json",
+                    url: urlhist,
+                    data: {
+                        "from": parseDate(dateFrom),
+                        "to": parseDate(dateC)
+                    },
+                    cache: false,
+                    type: "GET",
+                    async: true,
+                    success: function (data_hist) {
+                        j = 0;
+                        var line_hist = [];
+                        // generate historical serie of values
+                        if (data_hist[j]) {
+                            last = data_hist[j].id;
+                            texts.push(data_hist[j].name);
+                            labels.push([data_hist[j].name]);
                         }
-                    }
-                    ++j;
-                }
-                //push line vector to values vector for the last metric
-                if (data[j - 1]) {
-                    value.push([line]);
-                    // lower80.push(line80l);
-                    // upper80.push(line80u);
-                    // lower95.push(line95l);
-                    // upper95.push(line95u);
+                        while (data_hist[j]) {
+                            //check if we are still on the same metric
+                            if (data_hist[j].id != last) {
+                                var val = [line_hist];
+                                value.push(val);
+                                line_hist = [];
+                                last = data_hist[j].id;
+                                texts.push(data_hist[j].name);
+                                var labelsForOneChart = [];
+                                labelsForOneChart.push(data_hist[j].name);
+                                labels.push(labelsForOneChart);
+                            }
+                            //push date and value to line vector
+                            if (!isNaN(data_hist[j].value)) {
+                                line_hist.push({
+                                    x: data_hist[j].date,
+                                    y: data_hist[j].value
+                                });
+                            }
+                            ++j;
+                        }
+                        //push line vector to values vector for the last metric
+                        if (data_hist[j - 1]) {
+                            var val = [line_hist];
+                            value.push(val);
+                        }
+                        // add prediction series generated
+                        j = 0;
+                        x = 0;
+                        var line = [];
+                        var line80l = [];
+                        var line80u = [];
+                        var line95l = [];
+                        var line95u = [];
+                        if (data[j]) {
+                            last = data[j].id;
+                            labels[x].push("Predicted data", "80", "80", "95", "95");
+                            errors.push([data[j].forecastingError]);
+                        }
+                        while (data[j]) {
+                            //check if we are still on the same metric
+                            if (data[j].id !== last) {
+                                value[x].push(line, line80l, line80u, line95l, line95u);
+                                line = [];
+                                line80l = [];
+                                line80u = [];
+                                line95l = [];
+                                line95u = [];
+                                last = data[j].id;
+                                x++;
+                                labels[x].push("Predicted data", "80", "80", "95", "95");
+                                errors.push([data[j].forecastingError]);
+                            }
+                            //push date and value to line vector
+                            if (!isNaN(data[j].value)) {
+                                if (data[j].value !== null) {
+                                    line.push({
+                                        x: data[j].date,
+                                        y: data[j].value
+                                    });
+                                    line80l.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence80.second
+                                    });
+                                    line80u.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence80.first
+                                    });
+                                    line95l.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence95.second
+                                    });
+                                    line95u.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence95.first
+                                    });
+                                }
+                            }
+                            ++j;
+                        }
+                        //push line vector to values vector for the last metric
+                        if (data[j - 1]) {
+                            value[x].push(line, line80l, line80u, line95l, line95u);
+                        }
+                        document.getElementById("loader").style.display = "none";
+                        document.getElementById("chartContainer").style.display = "block";
+                        getMetricsCategories();
+                    }});
+                },
+                error: function (xhr, ajaxOptions, thrownError) {
+                    document.getElementById("loader").style.display = "none";
+                    document.getElementById("chartContainer").style.display = "block";
+                    document.getElementById("chartContainer").innerHTML = "Error " + xhr.status;
                 }
-                document.getElementById("loader").style.display = "none";
-                document.getElementById("chartContainer").style.display = "block";
-                getMetricsCategories();
-                drawChart();
-            },
-            error: function (xhr, ajaxOptions, thrownError) {
-                document.getElementById("loader").style.display = "none";
-                document.getElementById("chartContainer").style.display = "block";
-                document.getElementById("chartContainer").innerHTML = "Error " + xhr.status;
-            }
-        });
+            });
+        }
     }
-    console.log(value);
-    console.log(texts);
-
-}
 
 function getMetricsCategories () {
     jQuery.ajax({
@@ -145,6 +178,23 @@ function getMetricsCategories () {
     });
 }
 
+function parseDate(date) {
+    var date = new Date(date);
+    var dd = date.getDate();
+    var mm = date.getMonth() + 1; //January is 0!
+    var yyyy = date.getFullYear();
+
+    if(dd < 10) {
+        dd = '0' + dd;
+    }
+    if(mm < 10) {
+        mm = '0' + mm;
+    }
+
+    var stringDate = yyyy + '-' + mm + '-' + dd;
+    return stringDate
+}
+
 window.onload = function() {
     getData();
 };
\ No newline at end of file
diff --git a/src/main/resources/static/js/parseDataQFCurrent.js b/src/main/resources/static/js/parseDataQFCurrent.js
index e8b086e8..7effcfd0 100644
--- a/src/main/resources/static/js/parseDataQFCurrent.js
+++ b/src/main/resources/static/js/parseDataQFCurrent.js
@@ -21,8 +21,6 @@ function getData() {
     values = [];
     categories = [];
 
-    getCategories();
-
     //get data from API
     jQuery.ajax({
         dataType: "json",
@@ -46,29 +44,24 @@ function getData() {
                     values[i].push(data[i].metrics[j].value);
                 }
             }
-            drawChart();
+            getMetricsCategories();
         }
     });
 
     console.log(titles);
+    console.log("labels");
     console.log(labels);
     console.log(values);
 }
 
-function getCategories() {
-    var serverUrl = sessionStorage.getItem("serverUrl");
-    var url = "/api/metrics/categories";
-    if (serverUrl) {
-        url = serverUrl + url;
-    }
-    $.getJSON(url).then (function(cat) {
-        for (var i = 0; i < cat.length; i++) {
-            categories.push({
-                name: cat[i].name,
-                color: cat[i].color,
-                upperThreshold: cat[i].upperThreshold,
-            });
+function getMetricsCategories() {
+    jQuery.ajax({
+        url: "../api/metrics/categories",
+        type: "GET",
+        async: true,
+        success: function (response) {
+            categories = response;
+            drawChart();
         }
-        console.log(categories);
     });
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/parseDataQFPrediction.js b/src/main/resources/static/js/parseDataQFPrediction.js
index 4488f3ab..3bf7af1d 100644
--- a/src/main/resources/static/js/parseDataQFPrediction.js
+++ b/src/main/resources/static/js/parseDataQFPrediction.js
@@ -1,11 +1,14 @@
 var isdsi = false;
 var isqf = true;
 
-var url;
+var urlpred; // to get prediction data
+var urlhist; // to get historical data
 if (getParameterByName('id').length !== 0) {
-    url = parseURLSimple("../api/strategicIndicators/qualityFactors/metrics/prediction");
+    urlpred = parseURLSimple("../api/strategicIndicators/qualityFactors/metrics/prediction");
+    urlhist = parseURLSimple("../api/strategicIndicators/qualityFactors/metrics/historical");
 } else {
-    url = parseURLSimple("../api/qualityFactors/metrics/prediction");
+    urlpred = parseURLSimple("../api/qualityFactors/metrics/prediction");
+    urlhist = parseURLSimple("../api/qualityFactors/metrics/historical");
 }
 
 //initialize data vectors
@@ -26,17 +29,18 @@ function getData() {
     value = [];
     errors = [];
     var technique = $("#selectedTechnique").text();
-    var date1 = new Date($('#datepickerFrom').val());
-    var date2 = new Date($('#datepickerTo').val());
-    var timeDiff = date2.getTime() - date1.getTime();
+    var dateFrom = new Date($('#datepickerFrom').val());
+    var dateC = new Date($('#datepickerCurrentDate').val());
+    var dateTo = new Date($('#datepickerTo').val());
+    var timeDiff = dateTo.getTime() - dateC.getTime();
     var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
     if (diffDays < 1) {
         alert('To date has to be bigger than from date');
     } else {
-        //get data from API
+        //get predicted data from API
         jQuery.ajax({
             dataType: "json",
-            url: url,
+            url: urlpred,
             data: {
                 "technique": technique,
                 "horizon": diffDays
@@ -45,47 +49,95 @@ function getData() {
             type: "GET",
             async: true,
             success: function (data) {
-                for (i = 0; i < data.length; ++i) {
-                    //for each qf save name to texts vector and id to ids vector
-                    if (data[i].metrics.length > 0) {
-                        texts.push(data[i].name);
-                        ids.push(data[i].id);
-
-                        value.push([[]]);
-                        last = data[i].metrics[0].id;
-                        labels.push([data[i].metrics[0].name]);
-                        errors.push([data[i].metrics[0].forecastingError]);
-                        k = 0;
-                        for (j = 0; j < data[i].metrics.length; ++j) {
-                            //check if we are still on the same metric
-                            if (last != data[i].metrics[j].id) {
-                                labels[i].push(data[i].metrics[j].name);
-                                last = data[i].metrics[j].id;
-                                ++k;
-                                value[i].push([]);
-                                errors[i].push(data[i].metrics[j].forecastingError);
+                //get historical data from API
+                jQuery.ajax({
+                    dataType: "json",
+                    url: urlhist,
+                    data: {
+                        "from": parseDate(dateFrom),
+                        "to": parseDate(dateC)
+                    },
+                    cache: false,
+                    type: "GET",
+                    async: true,
+                    success: function (data_hist) {
+                        // generate historical serie of values
+                        for (i = 0; i < data_hist.length; ++i) {
+                            // order data
+                            data_hist[i].metrics.sort((a,b) => (a.name > b.name) ? 1 : ((b.name > a.name) ? -1 : 0));
+                            //for each qf save name to texts vector and id to ids vector
+                            if (data_hist[i].metrics.length > 0) {
+                                texts.push(data_hist[i].name);
+                                ids.push(data_hist[i].id);
+                                value.push([[]]);
+                                last = data_hist[i].metrics[0].id;
+                                labels.push([data_hist[i].metrics[0].name]);
+                                k = 0;
+                                for (j = 0; j < data_hist[i].metrics.length; ++j) {
+                                    //check if we are still on the same metric
+                                    if (last !== data_hist[i].metrics[j].id) {
+                                        // New metric
+                                        labels[i].push(data_hist[i].metrics[j].name);
+                                        last = data_hist[i].metrics[j].id;
+                                        ++k;
+                                        value[i].push([]);
+                                    }
+                                    //push date and value to values vector
+                                    if (!isNaN(data_hist[i].metrics[j].value)){
+                                        value[i][k].push(
+                                            {
+                                                x: data_hist[i].metrics[j].date,
+                                                y: data_hist[i].metrics[j].value
+                                            }
+                                        );
+                                    }
+                                }
+                            } else {
+                                data_hist.splice(i, 1);
+                                --i;
                             }
-                            //push date and value to values vector
-                            if (!isNaN(data[i].metrics[j].value)) {
-                                if (data[i].metrics[j].value !== null) {
-                                    value[i][k].push(
-                                        {
-                                            x: data[i].metrics[j].date,
-                                            y: data[i].metrics[j].value
+                        }
+                        // add prediction series generated
+                        for (i = 0; i < data.length; ++i) {
+                            // order data
+                            data[i].metrics.sort((a,b) => (a.name > b.name) ? 1 : ((b.name > a.name) ? -1 : 0));
+                            //for each qf save name to texts vector and id to ids vector
+                            if (data[i].metrics.length > 0) {
+                                value[i].push([]);
+                                last = data[i].metrics[0].id;
+                                labels[i].push("Predicted "+data[i].metrics[0].name);
+                                errors.push([data[i].metrics[0].forecastingError]);
+                                k = value[i].length-1;
+                                for (j = 0; j < data[i].metrics.length; ++j) {
+                                    //check if we are still on the same metric
+                                    if (last != data[i].metrics[j].id) {
+                                        labels[i].push("Predicted "+data[i].metrics[j].name);
+                                        last = data[i].metrics[j].id;
+                                        k++;
+                                        value[i].push([]);
+                                        errors[i].push(data[i].metrics[j].forecastingError);
+                                    }
+                                    //push date and value to values vector
+                                    if (!isNaN(data[i].metrics[j].value)) {
+                                        if (data[i].metrics[j].value !== null) {
+                                            value[i][k].push(
+                                                {
+                                                    x: data[i].metrics[j].date,
+                                                    y: data[i].metrics[j].value
+                                                }
+                                            );
                                         }
-                                    );
+                                    }
                                 }
+                            } else {
+                                data.splice(i, 1);
+                                --i;
                             }
                         }
-                    } else {
-                        data.splice(i, 1);
-                        --i;
-                    }
-                }
-                document.getElementById("loader").style.display = "none";
-                document.getElementById("chartContainer").style.display = "block";
-                getMetricsCategories();
-                drawChart();
+                        document.getElementById("loader").style.display = "none";
+                        document.getElementById("chartContainer").style.display = "block";
+                        getMetricsCategories();
+                    }});
             },
             error: function (xhr, ajaxOptions, thrownError) {
                 document.getElementById("loader").style.display = "none";
@@ -94,9 +146,6 @@ function getData() {
             }
         });
     }
-    console.log(texts);
-    console.log(labels);
-    console.log(value);
 }
 
 function getMetricsCategories () {
diff --git a/src/main/resources/static/js/parseDataSIPrediction.js b/src/main/resources/static/js/parseDataSIPrediction.js
index 1299b3b0..82694b4c 100644
--- a/src/main/resources/static/js/parseDataSIPrediction.js
+++ b/src/main/resources/static/js/parseDataSIPrediction.js
@@ -20,9 +20,10 @@ function getData() {
     ids = [];
     errors = [];
     var technique = $("#selectedTechnique").text();
-    var date1 = new Date($('#datepickerFrom').val());
-    var date2 = new Date($('#datepickerTo').val());
-    var timeDiff = date2.getTime() - date1.getTime();
+    var dateFrom = new Date($('#datepickerFrom').val());
+    var dateC = new Date($('#datepickerCurrentDate').val());
+    var dateTo = new Date($('#datepickerTo').val());
+    var timeDiff = dateTo.getTime() - dateC.getTime();
     var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
     if (diffDays < 1) {
         alert('To date has to be bigger than from date');
@@ -39,51 +40,123 @@ function getData() {
             type: "GET",
             async: true,
             success: function (data) {
-                j = 0;
-                var line = [];
-                if (data[j]) {
-                    last = data[j].id;
-                    texts.push(data[j].name);
-                    labels.push([data[j].name]);
-                    ids.push(data[j].id);
-                    errors.push([data[j].forecastingError]);
+                //get historical data from API
+                jQuery.ajax({
+                    dataType: "json",
+                    url: "../api/strategicIndicators/historical",
+                    data: {
+                        "from": parseDate(dateFrom),
+                        "to": parseDate(dateC)
+                    },
+                    cache: false,
+                    type: "GET",
+                    async: true,
+                    success: function (data_hist) {
+                        j = 0;
+                        var line_hist = [];
+                        if (data_hist[j]) {
+                            last = data_hist[j].id;
+                            texts.push(data_hist[j].name);
+                            labels.push([data_hist[j].name]);
+                            ids.push(data_hist[j].id);
 
-                    data[j].probabilities.forEach(function (category) {
-                        categories.push({
-                            name: category.label,
-                            color: category.color,
-                            upperThreshold: category.upperThreshold
-                        });
-                    });
-                }
-                while (data[j]) {
-                    //check if we are still on the same Strategic Indicator
-                    if (data[j].id !== last) {
-                        value.push([line]);
-                        line = [];
-                        last = data[j].id;
-                        texts.push(data[j].name);
-                        labels.push([data[j].name]);
-                        ids.push(data[j].id);
-                        errors.push([data[j].forecastingError]);
-                    }
-                    //push date and value to line vector
-                    if (data[j].value !== null) {
-                        if (!isNaN(data[j].value.first)) {
-                            line.push({
-                                x: data[j].date,
-                                y: data[j].value.first
+                            data_hist[j].probabilities.forEach(function (category) {
+                                categories.push({
+                                    name: category.label,
+                                    color: category.color,
+                                    upperThreshold: category.upperThreshold
+                                });
                             });
                         }
-                    }
-                    ++j;
-                }
-                //push line vector to values vector for the last metric
-                if (data[j - 1])
-                    value.push([line]);
-                document.getElementById("loader").style.display = "none";
-                document.getElementById("chartContainer").style.display = "block";
-                drawChart();
+                        while (data_hist[j]) {
+                            //check if we are still on the same Strategic Indicator
+                            if (data_hist[j].id != last) {
+                                var val = [line_hist];
+                                value.push(val);
+                                line_hist = [];
+                                last = data_hist[j].id;
+                                texts.push(data_hist[j].name);
+                                var labelsForOneChart = [];
+                                labelsForOneChart.push(data_hist[j].name);
+                                labels.push(labelsForOneChart);
+                                ids.push(data_hist[j].id);
+                            }
+                            //push date and value to line vector
+                            if (!isNaN(data_hist[j].value.first)) {
+                                line_hist.push({
+                                    x: data_hist[j].date,
+                                    y: data_hist[j].value.first
+                                });
+                            }
+                            ++j;
+                        }
+                        //push line vector to values vector for the last metric
+                        if (data_hist[j - 1]) {
+                            var val = [line_hist];
+                            value.push(val);
+                        }
+                        // add prediction series generated
+                        j = 0;
+                        x = 0;
+                        var line = [];
+                        var line80l = [];
+                        var line80u = [];
+                        var line95l = [];
+                        var line95u = [];
+                        if (data[j]) {
+                            last = data[j].id;
+                            labels[x].push("Predicted data", "80", "80", "95", "95");
+                            errors.push([data[j].forecastingError]);
+                        }
+                        while (data[j]) {
+                            //check if we are still on the same Strategic Indicator
+                            if (data[j].id !== last) {
+                                value[x].push(line, line80l, line80u, line95l, line95u);
+                                line = [];
+                                line80l = [];
+                                line80u = [];
+                                line95l = [];
+                                line95u = [];
+                                last = data[j].id;
+                                x++;
+                                labels[x].push("Predicted data", "80", "80", "95", "95");
+                                errors.push([data[j].forecastingError]);
+                            }
+                            //push date and value to line vector
+                            if (data[j].value !== null) {
+                                if (!isNaN(data[j].value.first)) {
+                                    line.push({
+                                        x: data[j].date,
+                                        y: data[j].value.first
+                                    });
+                                    line80l.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence80.second
+                                    });
+                                    line80u.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence80.first
+                                    });
+                                    line95l.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence95.second
+                                    });
+                                    line95u.push({
+                                        x: data[j].date,
+                                        y: data[j].confidence95.first
+                                    });
+                                }
+                            }
+                            ++j;
+                        }
+                        //push line vector to values vector for the last metric
+                        if (data[j - 1])
+                            value[x].push(line, line80l, line80u, line95l, line95u);
+                        document.getElementById("loader").style.display = "none";
+                        document.getElementById("chartContainer").style.display = "block";
+                        drawChart();
+
+                    }});
             },
             error: function (jqXHR, textStatus, errorThrown) {
                 if (jqXHR.status == 409)
@@ -92,12 +165,10 @@ function getData() {
                     alert("Datasource connection failed.");
                 document.getElementById("loader").style.display = "none";
                 document.getElementById("chartContainer").style.display = "block";
-                document.getElementById("chartContainer").innerHTML = "Error " + xhr.status;
+                document.getElementById("chartContainer").innerHTML = "Error " + jqXHR.status;
             }
         });
     }
-    console.log(value);
-    console.log(texts);
 }
 
 window.onload = function() {
diff --git a/src/main/resources/static/js/predictionLineChart.js b/src/main/resources/static/js/predictionLineChart.js
new file mode 100644
index 00000000..b2a433df
--- /dev/null
+++ b/src/main/resources/static/js/predictionLineChart.js
@@ -0,0 +1,582 @@
+var timeFormat = 'YYYY-MM-DD';
+var config = [];
+var charts = [];
+
+if (isqf || isdsi) {// qf and dsi -> no intervals of confidence
+    var colors_hist = ['rgb(75, 149, 179)', 'rgb(242, 177, 111)', 'rgb(110, 212, 110)', 'rgb(255, 135, 135)',
+        'rgb(232, 230, 139)', 'rgb(222, 147, 230)' ];
+    var colors_pred = ['rgb(1, 119, 166)', 'rgb(255, 153, 51)', 'rgb(51, 204, 51)', 'rgb(255, 80, 80)',
+        'rgb(204, 201, 53)', 'rgb(192, 96, 201)'];
+} else // metrics and si -> intervals of confidence
+    var colors = ['rgb(75, 149, 179)', 'rgb(1, 119, 166)', 'rgb( 254, 126, 0)', 'rgb( 254, 126, 0)', 'rgb( 255, 177, 101)', 'rgb( 255, 177, 101)'];
+
+if (isqf || isdsi) { // qf and dsi -> no intervals of confidence
+    $('#showConfidence').prop("disabled",true);
+}
+Chart.plugins.register({
+    afterDraw: function(chart) {
+        var allEmpty = true;
+        for (var i = 0; i < chart.data.datasets.length; i++) {
+            if (chart.data.datasets[i].data.length > 0) allEmpty = false;
+        }
+        if (allEmpty) {
+            // No data is present
+            var ctx = chart.chart.ctx;
+            var width = chart.chart.width;
+            var height = chart.chart.height;
+            chart.clear();
+
+            ctx.save();
+            ctx.textAlign = 'center';
+            ctx.textBaseline = 'middle';
+            ctx.font = "Helvetica Nueue";
+            ctx.fillText(chart.data.errors[0], width / 2, height / 2, width);
+            ctx.restore();
+        }
+    }
+});
+
+function drawChart() {
+    config = [];
+    for (var i = 0; i < texts.length; ++i) {    //create config for each chart
+        var c = {
+            type: 'line',
+            data: {
+                datasets: [],
+                errors: []
+            },
+            options: {
+                title: {
+                    display: false,
+                    fontSize: 16,
+                    text: texts[i]
+                },
+                responsive: false,
+                legend: {
+                    display: true,
+                    labels: {
+                        boxWidth: 13,
+                        generateLabels: function (chart) {
+                            var data = chart.data;
+                            var maxLength = Math.round(70/data.datasets.length);
+
+                            return data.datasets.map(function (dataset, i) {
+                                var label = dataset.label;
+                                if (label.length > maxLength + 3) {
+                                    label = label.substring(0, maxLength) + "...";
+                                }
+                                return {
+                                    text: label,
+                                    fillStyle: dataset.backgroundColor,
+                                    strokeStyle: dataset.borderColor,
+                                    lineWidth: dataset.borderWidth,
+                                    hidden: dataset.hidden,
+                                    index: i
+                                }
+                            })
+                        }
+                    },
+                    onClick: function(e, legendItem) {
+                        // default function
+                        var index = legendItem.index;
+                        var chart = this.chart;
+                        chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                        chart.update();
+                    },
+                    filter: null,
+                },
+                scales: {
+                    xAxes: [{
+                        type: "time",
+                        time: {
+                            unit: 'day',
+                            parser: timeFormat,
+                            tooltipFormat: 'll'
+                        },
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'Date'
+                        }
+                    }],
+                    yAxes: [{
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'value'
+                        },
+                        ticks: {
+                            max: 1.2,
+                            min: 0
+                        }
+                    }]
+                },
+                tooltips: {
+                    enabled: false,
+                    custom: function(tooltipModel) {
+                        // Tooltip Element
+                        var tooltipEl = document.getElementById('chartjs-tooltip');
+
+                        // Create element on first render
+                        if (!tooltipEl) {
+                            tooltipEl = document.createElement('div');
+                            tooltipEl.id = 'chartjs-tooltip';
+                            tooltipEl.innerHTML = '<table></table>';
+                            document.body.appendChild(tooltipEl);
+                        }
+
+                        // Hide if no tooltip
+                        if (tooltipModel.opacity === 0) {
+                            tooltipEl.style.opacity = 0;
+                            return;
+                        }
+
+                        // Set caret Position
+                        tooltipEl.classList.remove('above', 'below', 'no-transform');
+                        if (tooltipModel.yAlign) {
+                            tooltipEl.classList.add(tooltipModel.yAlign);
+                        } else {
+                            tooltipEl.classList.add('no-transform');
+                        }
+
+                        function getBody(bodyItem) {
+                            return bodyItem.lines;
+                        }
+
+                        // Set Text
+                        if (tooltipModel.body) {
+                            var titleLines = tooltipModel.title || [];
+                            var bodyLines = tooltipModel.body.map(getBody);
+
+                            var innerHtml = '<thead>';
+
+                            titleLines.forEach(function(title) {
+                                innerHtml += '<tr><th>' + title + '</th></tr>';
+                            });
+                            innerHtml += '</thead><tbody>';
+
+                            bodyLines.forEach(function(body, i) {
+                                var colors = tooltipModel.labelColors[i];
+                                var style = 'background:' + colors.backgroundColor.replace(', 0.3)', ')').replace('rgba', 'rgb');
+                                style += '; border-color:' + colors.borderColor;
+                                style += '; border-width: 2px';
+                                var span = '<span class="chartjs-tooltip-key" style="' + style + '"></span>';
+                                if (body[0].indexOf("<b>") === 0)
+                                    innerHtml += '<tr><td>' + body + '</td></tr>';
+                                else
+                                    innerHtml += '<tr><td>' + span + body + '</td></tr>';
+                            });
+                            innerHtml += '</tbody>';
+
+                            var tableRoot = tooltipEl.querySelector('table');
+                            tableRoot.innerHTML = innerHtml;
+                        }
+
+                        // `this` will be the overall tooltip
+                        var position = this._chart.canvas.getBoundingClientRect();
+
+                        // Display, position, and set styles for font
+                        tooltipEl.style.opacity = 1;
+                        tooltipEl.style.position = 'absolute';
+                        tooltipEl.style.left = position.left + window.pageXOffset + tooltipModel.caretX + 'px';
+                        tooltipEl.style.top = position.top + window.pageYOffset + tooltipModel.caretY + 'px';
+                        tooltipEl.style.fontFamily = tooltipModel._bodyFontFamily;
+                        tooltipEl.style.fontSize = tooltipModel.bodyFontSize + 'px';
+                        tooltipEl.style.fontStyle = tooltipModel._bodyFontStyle;
+                        tooltipEl.style.padding = tooltipModel.yPadding + 'px ' + tooltipModel.xPadding + 'px';
+                        tooltipEl.style.pointerEvents = 'none';
+                    }
+                },
+                annotation: {
+                    annotations: []
+                }
+            }
+        };
+
+        for (j = 0; j < value[i].length; ++j) {
+            if (value[i][j].length === 0) hidden = true;
+            var showLine = true;
+            var pointStyle = 'circle';
+            var pointRadius = 3;
+            var borderWidth = 1;
+            var color = [];
+            if (isqf || isdsi) {
+                var num = value[i].length/2;
+                if (j < num) { // if we work with historical data
+                    color = colors_hist[j % colors_hist.length];
+                } else { // if we work with predicted data
+                    color = colors_pred[(j-num) % colors_pred.length];
+                }
+            } else color = colors[j % colors.length];
+            // to paint areas for confidence interval series
+            if ((labels[i][j] == "80" || labels[i][j] == "95") && prediction) {
+                c.data.datasets.push({
+                    label: labels[i][j],
+                    hidden: false,
+                    backgroundColor: color.replace(')', ', 0.3)').replace('rgb', 'rgba'),
+                    borderColor: color.replace(')', ', 0.3)').replace('rgb', 'rgba'),
+                    pointHitRadius: 1.5,
+                    pointHoverRadius: 1.5,
+                    pointRadius: 1.5,
+                    pointBorderWidth: 1.5,
+                    fill: 1,
+                    data: value[i][j],
+                    showLine: showLine,
+                    pointStyle: pointStyle,
+                    radius: pointRadius,
+                    borderWidth: borderWidth
+                });
+            } else { // to paint mean serie
+                c.data.datasets.push({
+                    label: labels[i][j],
+                    hidden: false,
+                    backgroundColor: color,
+                    borderColor: color,
+                    fill: false,
+                    data: value[i][j],
+                    showLine: showLine,
+                    pointStyle: pointStyle,
+                    radius: pointRadius,
+                    borderWidth: borderWidth
+                });
+            }
+
+            if (!showLine) {
+                c.options.tooltips.callbacks = {
+                    label: function (tooltipItems, data) {
+                        var posY = data.datasets[tooltipItems.datasetIndex].data[0].y;
+                        if (posY === 1.1 || posY === 1.2) {
+                            return "<b>Requirement: </b>" + data.datasets[tooltipItems.datasetIndex].data[tooltipItems.index].requirement + "<br/>" +
+                                "<b>Comments: </b>" + data.datasets[tooltipItems.datasetIndex].data[tooltipItems.index].comments;
+                        } else
+                            return data.datasets[tooltipItems.datasetIndex].label + ': ' + tooltipItems.yLabel;
+                    }
+                };
+            }
+
+            if (typeof errors !== 'undefined') {
+                c.data.errors.push(errors[i][j]);
+            }
+            else {
+                c.data.errors.push("No data to display");
+            }
+        }
+
+        //Add category lines
+        if (typeof categories !== 'undefined') {
+            var annotations = [];
+            var lineHighCategory = {
+                type: 'line',
+                drawTime: 'beforeDatasetsDraw',
+                mode: 'horizontal',
+                scaleID: 'y-axis-0',
+                value: categories[1].upperThreshold,
+                borderColor: categories[0].color,
+                borderWidth: 1,
+                label: {
+                    enabled: false,
+                    content: categories[0].name
+                }
+            };
+            annotations.push(lineHighCategory);
+
+            var lineLowCategory = {
+                type: 'line',
+                drawTime: 'beforeDatasetsDraw',
+                mode: 'horizontal',
+                scaleID: 'y-axis-0',
+                value: categories[categories.length - 1].upperThreshold,
+                borderColor: categories[categories.length - 1].color,
+                borderWidth: 1,
+                label: {
+                    enabled: false,
+                    content: categories[categories.length - 1].name
+                }
+            };
+            annotations.push(lineLowCategory);
+
+            c.options.annotation.annotations = annotations;
+        }
+
+        // filter legend in case of SIs i Metrics
+        if (!isqf && !isdsi) {
+            var filter = function(legendItem) {
+                // hide duplicated 80 and 95 from legend and Predicted data too
+                if (legendItem.index === 3 || legendItem.index === 5 || legendItem.index === 1) {
+                    return false;
+                }
+                return true;
+            };
+            c.options.legend.labels.filter = filter;
+        } else  { // filter legend in case of DSIs and Factors
+            var filter = function(legendItem) {
+                // hide Predicted data from legend
+                if (legendItem.text.includes('Predicted') || legendItem.text.includes('Predic...')) {
+                    return false;
+                }
+                return true;
+            };
+            c.options.legend.labels.filter = filter;
+        }
+
+        config.push(c);
+    }
+
+    for (i = 0; i < texts.length; ++i) {
+        var a = document.createElement('a');
+        var currentURL = window.location.href;
+        if (isdsi) {  //if it is a Stacked Line Chart for Detailed Strategic Indicators
+            urlLink = "../QualityFactors/PredictionChart?id=" + ids[i] + "&name=" + texts[i];
+            a.setAttribute("href", urlLink);
+        } else if (isqf) { //if it is a Stacked Line Chart for Quality Factors
+            var name = getParameterByName('name');
+            var id = getParameterByName('id');
+            if (name.length != 0) {//if we know from which Detailed Strategic Indicator we are coming
+                urlLink = "../Metrics/PredictionChart?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + texts[i];
+            }
+            else {
+                urlLink = "../Metrics/PredictionChart?id=" + ids[i] + "&name=" + texts[i];
+            }
+            a.setAttribute("href", urlLink);
+        } else if (isSi) {
+            //if its a SI chart make it a hyperlink
+            urlLink = "../DetailedStrategicIndicators/PredictionChart?id=" + ids[i] + "&name=" + texts[i];
+            a.setAttribute("href", urlLink);
+        }
+        a.innerHTML = texts[i];
+        a.style.fontSize = "16px";
+        var div = document.createElement('div');
+        div.style.display = "inline-block";
+        var p = document.createElement('p');
+        var ctx = document.createElement('canvas');
+        ctx.id = 'canvas' + i;
+        ctx.width = 350;
+        ctx.height = 350;
+        ctx.style.display = "inline";
+        document.getElementById("chartContainer").appendChild(div).appendChild(ctx);
+        div.appendChild(p).appendChild(a);
+        ctx.getContext("2d");
+
+        var chart = new Chart(ctx, config[i]);
+        charts.push(chart);
+        window.myLine = chart;  //draw chart
+    }
+
+    var fit = sessionStorage.getItem("fitToContent");
+    if (fit === "true") {
+        $("#fitToContent").prop("checked", true);
+        fitToContent();
+    } else {
+        $("#fitToContent").prop("checked", false);
+        normalRange();
+    }
+
+    var show = sessionStorage.getItem("showConfidence");
+    if (show === "true") {
+        $("#showConfidence").prop("checked", true);
+        // show confidence intervals ticked
+        showConfidence();
+    } else {
+        // show confidence intervals not ticked
+        $("#showConfidence").prop("checked", false);
+        notShowConfidence();
+    }
+}
+
+function getMax (datasets) {
+    var max = 0;
+    for(var i = 0; i < datasets.length; i++) {
+        var dataset = datasets[i];
+        if(datasets[i].hidden) {
+            continue;
+        }
+        dataset.data.forEach(function(d) {
+            if(d.y > max) {
+                max = d.y
+            }
+        });
+    }
+    return max;
+}
+
+function getMin (datasets) {
+    var min = 1;
+    for(var i = 0; i < datasets.length; i++) {
+        var dataset = datasets[i];
+        if(datasets[i].hidden) {
+            continue;
+        }
+        dataset.data.forEach(function(d) {
+            if(d.y < min) {
+                min = d.y
+            }
+        });
+    }
+    return min;
+}
+
+$("#fitToContent").change(function () {
+    if ($(this).is(":checked")) {
+        sessionStorage.setItem("fitToContent", "true");
+        fitToContent();
+    } else {
+        sessionStorage.setItem("fitToContent", "false");
+        normalRange();
+    }
+});
+
+$("#showConfidence").change(function () {
+    if ($(this).is(":checked")) {
+        // show confidence intervals ticked
+        sessionStorage.setItem("showConfidence", "true");
+        showConfidence();
+    } else {
+        // show confidence intervals not ticked
+        sessionStorage.setItem("showConfidence", "false");
+        notShowConfidence();
+    }
+});
+
+function showConfidence() {
+    charts.forEach(function (chart) {
+        for (var i = 1; i < chart.config.data.datasets.length; i++) {
+            if(chart.config.data.datasets[i].label === "80" || chart.config.data.datasets[i].label === "95") {
+                chart.config.data.datasets[i].hidden = false;
+            }
+        }
+        chart.update();
+    });
+}
+
+function notShowConfidence() {
+    charts.forEach(function (chart) {
+        for (var i = 1; i < chart.config.data.datasets.length; i++) {
+            if(chart.config.data.datasets[i].label === "80" || chart.config.data.datasets[i].label === "95") {
+                chart.config.data.datasets[i].hidden = true;
+            }
+        }
+        chart.update();
+    });
+}
+
+
+function fitToContent() {
+    charts.forEach(function (chart) {
+        var max = getMax(chart.config.data.datasets);
+        var min = getMin(chart.config.data.datasets);
+        if (max === min) {
+            max += 0.001;
+            min -= 0.001;
+        }
+        chart.config.options.scales.yAxes[0].ticks.max = max;
+        chart.config.options.scales.yAxes[0].ticks.min = min;
+
+        chart.config.options.legend.onClick = function (e, legendItem) {
+            var index = legendItem.index;
+            var chart = this.chart;
+            if (legendItem.text === "80" || legendItem.text === "95") {
+                chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                chart.data.datasets[index + 1].hidden = !chart.data.datasets[index + 1].hidden;
+            } else if (!isqf && !isdsi) { // hide & show logic for SIs and Metrics
+                chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                if(chart.data.datasets[index].hidden == true) { // if hide hist. data
+                    // for predicted data
+                    chart.data.datasets[index + 1].hidden = true;
+                    // for 80
+                    chart.data.datasets[index + 2].hidden = true;
+                    chart.data.datasets[index + 3].hidden = true;
+                    //for 95
+                    chart.data.datasets[index + 4].hidden = true;
+                    chart.data.datasets[index + 5].hidden = true;
+                } else { // if show hist. data
+                    // for predicted data
+                    chart.data.datasets[index + 1].hidden = false;
+                    var show = sessionStorage.getItem("showConfidence");
+                    if (show == "true") {
+                        // for 80
+                        chart.data.datasets[index + 2].hidden = false;
+                        chart.data.datasets[index + 3].hidden = false;
+                        //for 95
+                        chart.data.datasets[index + 4].hidden = false;
+                        chart.data.datasets[index + 5].hidden = false;
+                    } else if (show == "false") {
+                        // for 80
+                        chart.data.datasets[index + 2].hidden = true;
+                        chart.data.datasets[index + 3].hidden = true;
+                        //for 95
+                        chart.data.datasets[index + 4].hidden = true;
+                        chart.data.datasets[index + 5].hidden = true;
+                    }
+                }
+            } else { // hide & show logic for DSIs and Factors
+                var num = chart.data.datasets.length/2;
+                chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                chart.data.datasets[index + num].hidden = !chart.data.datasets[index + num].hidden;
+            }
+            var max = getMax(chart.data.datasets);
+            var min = getMin(chart.data.datasets);
+            if (max === min) {
+                max += 0.001;
+                min -= 0.001;
+            }
+            chart.options.scales.yAxes[0].ticks.max = max;
+            chart.options.scales.yAxes[0].ticks.min = min;
+            chart.update();
+        };
+
+        chart.update();
+    });
+}
+
+function normalRange() {
+    charts.forEach(function (chart) {
+        chart.config.options.scales.yAxes[0].ticks.max = 1.2;
+        chart.config.options.scales.yAxes[0].ticks.min = 0;
+
+        chart.config.options.legend.onClick = function(e, legendItem) {
+            var index = legendItem.index;
+            var chart = this.chart;
+            if (legendItem.text === "80" || legendItem.text === "95") {
+                chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                chart.data.datasets[index + 1].hidden = !chart.data.datasets[index + 1].hidden;
+            } else if (!isqf && !isdsi) { // hide & show logic for SIs and Metrics
+                chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                if(chart.data.datasets[index].hidden == true) { // if hide hist. data
+                    // for predicted data
+                    chart.data.datasets[index + 1].hidden = true;
+                    // for 80
+                    chart.data.datasets[index + 2].hidden = true;
+                    chart.data.datasets[index + 3].hidden = true;
+                    //for 95
+                    chart.data.datasets[index + 4].hidden = true;
+                    chart.data.datasets[index + 5].hidden = true;
+                } else { // if show hist. data
+                    // for predicted data
+                    chart.data.datasets[index + 1].hidden = false;
+                    var show = sessionStorage.getItem("showConfidence");
+                    if (show == "true") {
+                        // for 80
+                        chart.data.datasets[index + 2].hidden = false;
+                        chart.data.datasets[index + 3].hidden = false;
+                        //for 95
+                        chart.data.datasets[index + 4].hidden = false;
+                        chart.data.datasets[index + 5].hidden = false;
+                    } else if (show == "false") {
+                        // for 80
+                        chart.data.datasets[index + 2].hidden = true;
+                        chart.data.datasets[index + 3].hidden = true;
+                        //for 95
+                        chart.data.datasets[index + 4].hidden = true;
+                        chart.data.datasets[index + 5].hidden = true;
+                    }
+                }
+            } else { // hide & show logic for DSIs and Factors
+                var num = chart.data.datasets.length/2;
+                chart.data.datasets[index].hidden = !chart.data.datasets[index].hidden;
+                chart.data.datasets[index + num].hidden = !chart.data.datasets[index + num].hidden;
+            }
+            chart.update();
+        };
+
+        chart.update();
+    });
+}
+
diff --git a/src/main/resources/static/js/radarChart.js b/src/main/resources/static/js/radarChart.js
index 6b38a700..48603ac4 100644
--- a/src/main/resources/static/js/radarChart.js
+++ b/src/main/resources/static/js/radarChart.js
@@ -46,6 +46,7 @@ function drawChart() {
             data: values[i],
             fill: false
         });
+        console.log(categories);
         for (var k = categories.length-1; k >= 0; --k) {
             var fill = categories.length-1-k;
             if (k == categories.length-1) fill = true;
@@ -64,6 +65,7 @@ function drawChart() {
                 fill: fill
             })
         }
+        console.log(dataset);
         window.myLine = new Chart(ctx, {    //draw chart with the following config
             type: 'radar',
             data: {
@@ -94,7 +96,6 @@ function drawChart() {
                 }
             }
         });
-
         //Warnings
         if (typeof warnings !== "undefined") {
             var text = "";
diff --git a/src/main/resources/static/js/scriptDatePicker.js b/src/main/resources/static/js/scriptDatePicker.js
index 00da75c3..70dc4f90 100644
--- a/src/main/resources/static/js/scriptDatePicker.js
+++ b/src/main/resources/static/js/scriptDatePicker.js
@@ -58,21 +58,38 @@ function configureHistoric () {
     $('#datepickerFrom').datepicker().value(historicFrom);
     $('#datepickerTo').datepicker().value(historicTo);
 
+    // hide prediction related parts
     $('#techniqueDropdownDiv').hide();
+    $('#current_dateDiv').hide();
+    $('#showConfidenceDiv').hide();
 }
 
-function configurePrediction () {
-    config.minDate = today;
+async function configurePrediction () {
+    getPredictionCurrentDate();
+
+    config.maxDate = parseDate(sessionStorage.getItem("predictionCurrentDate"));
     $('#datepickerFrom').datepicker(config);
+    config.maxDate = null; // necessary to config min date correctly
+    var d = new Date(sessionStorage.getItem("predictionCurrentDate"));
+    var dateMin = d.setDate(d.getDate() + 1);
+    config.minDate = parseDate(dateMin);
+    $('#datepickerCurrentDate').datepicker(config);
     $('#datepickerTo').datepicker(config);
 
     $('#intervalsDropdown').append('<li><a onclick="next7Days();$(\'#chartContainer\').empty();getData()" href="#">Next 7 days</a></li>');
     $('#intervalsDropdown').append('<li><a onclick="next14Days();$(\'#chartContainer\').empty();getData()" href="#">Next 14 days</a></li>');
 
-    var predictionFrom = parseDate(today);
-    $('#datepickerFrom').datepicker().value(predictionFrom);
-    $('#datepickerFrom').prop("disabled",true);
-    $('#fromDiv').find("span").css("pointer-events", "none");
+
+    var predictionFrom = sessionStorage.getItem("predictionFromDate");
+    if (!predictionFrom)
+        back14Days();
+    else $('#datepickerFrom').datepicker().value(predictionFrom);
+
+    var predictionCurrent = sessionStorage.getItem("predictionCurrentDate");
+    $('#datepickerCurrentDate').datepicker().value(predictionCurrent);
+    $('#current_dateDiv').show();
+    $('#datepickerCurrentDate').prop("disabled",true);
+    $('#current_dateDiv').find("span").css("pointer-events", "none");
 
     var predictionTo = sessionStorage.getItem("predictionToDate");
     if (!predictionTo)
@@ -81,6 +98,8 @@ function configurePrediction () {
 
     $('#techniqueDropdownDiv').show();
     loadTechniques();
+
+    $('#showConfidenceDiv').show();
 }
 
 function thisWeek() {
@@ -131,14 +150,70 @@ function setTechnique(technique) {
     $("#selectedTechnique").text(technique);
 }
 
+function getPredictionCurrentDate() {
+    var saved = sessionStorage.getItem("predictionCurrentDate"); // current actual saved in sessionStorage
+    // set current datapicker for each case
+    if (currentURL.match("/Metrics/PredictionChart")) {
+        jQuery.ajax({
+            dataType: "json",
+            url: "../api/metrics/currentDate",
+            cache: false,
+            type: "GET",
+            async: false,
+            success: function (date) {
+                console.log(date);
+                if (saved !== date) {
+                    sessionStorage.setItem("predictionCurrentDate", date);
+                    sessionStorage.removeItem("predictionToDate");
+                    sessionStorage.removeItem("predictionFromDate");
+                }
+            }
+        });
+    } else if (currentURL.match("/QualityFactors/PredictionChart")) {
+        jQuery.ajax({
+            dataType: "json",
+            url: "../api/qualityFactors/currentDate",
+            cache: false,
+            type: "GET",
+            async: false,
+            success: function (date) {
+                console.log(date);
+                if (saved !== date) {
+                    sessionStorage.setItem("predictionCurrentDate", date);
+                    sessionStorage.removeItem("predictionToDate");
+                    sessionStorage.removeItem("predictionFromDate");
+                }
+            }
+        });
+    } else if (currentURL.match("/StrategicIndicators/PredictionChart") || currentURL.match("/DetailedStrategicIndicators/PredictionChart")) {
+        jQuery.ajax({
+            dataType: "json",
+            url: "../api/strategicIndicators/currentDate",
+            cache: false,
+            type: "GET",
+            async: false,
+            success: function (date) {
+                console.log(date);
+                if (saved !== date) {
+                    sessionStorage.setItem("predictionCurrentDate", date);
+                    sessionStorage.removeItem("predictionToDate");
+                    sessionStorage.removeItem("predictionFromDate");
+                }
+            }
+        });
+    }
+}
+
 $("#applyButton").click(function () {
     $('#chartContainer').empty();
     getData();
-
     var currentURL = window.location.href;
     if (currentURL.match("/PredictionChart")) {
+        // set from and to datapickers
         var predictionTo = $('#datepickerTo').datepicker().val();
         sessionStorage.setItem("predictionToDate", predictionTo);
+        var predictionFrom = $('#datepickerFrom').datepicker().val();
+        sessionStorage.setItem("predictionFromDate", predictionFrom);
     } else {
         var historicFrom = $('#datepickerFrom').datepicker().val();
         sessionStorage.setItem("historicFromDate", historicFrom);
@@ -197,22 +272,41 @@ function thisYear() {
 // Prediction intervals
 
 function next7Days () {
-    var date = new Date().setDate(today.getDate() + 7);
+    var d = new Date(sessionStorage.getItem("predictionCurrentDate"));
+    var date = d.setDate(d.getDate() + 7);
     var textDate = parseDate(date);
     $('#datepickerTo').datepicker().value(textDate);
     sessionStorage.setItem("predictionToDate", textDate);
+    back14Days ();
+}
+
+function back14Days () {
+    var d = new Date(sessionStorage.getItem("predictionCurrentDate"));
+    var date = d.setDate(d.getDate() - 14);
+    var textDate = parseDate(date);
+    $('#datepickerFrom').datepicker().value(textDate);
+    sessionStorage.setItem("predictionFromDate", textDate);
 }
 
 function next14Days () {
-    var date = new Date().setDate(today.getDate() + 14);
+    var d = new Date(sessionStorage.getItem("predictionCurrentDate"));
+    var date = d.setDate(d.getDate() + 14);
     var textDate = parseDate(date);
     $('#datepickerTo').datepicker().value(textDate);
     sessionStorage.setItem("predictionToDate", textDate);
+    back28Days ();
+}
+
+function back28Days () {
+    var d = new Date(sessionStorage.getItem("predictionCurrentDate"));
+    var date = d.setDate(d.getDate() - 28);
+    var textDate = parseDate(date);
+    $('#datepickerFrom').datepicker().value(textDate);
+    sessionStorage.setItem("predictionFromDate", textDate);
 }
 
 function parseDate(date) {
     var date = new Date(date);
-    console.log(date);
     var dd = date.getDate();
     var mm = date.getMonth() + 1; //January is 0!
     var yyyy = date.getFullYear();
diff --git a/src/main/resources/static/js/simulationFactors.js b/src/main/resources/static/js/simulationFactors.js
index 8eb39cf6..8694c013 100644
--- a/src/main/resources/static/js/simulationFactors.js
+++ b/src/main/resources/static/js/simulationFactors.js
@@ -30,6 +30,18 @@ function getQualityFactorsCategories () {
     });
 }
 
+function getFactorsCategories (titles, ids, labels, values) {
+    var url = "../api/qualityFactors/categories";
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            categories = response;
+            showDetailedStrategicIndicators(titles, ids, labels, values)
+        }
+    });
+}
+
 function showQualityFactorSliders () {
     // Factor categories
     var rangeHighlights = [];
@@ -155,7 +167,8 @@ function getDetailedStrategicIndicators () {
                 }
             }
             checkFactorsSliders();
-            showDetailedStrategicIndicators(titles, ids, labels, values);
+            getFactorsCategories (titles, ids, labels, values);
+            //showDetailedStrategicIndicators(titles, ids, labels, values);
         }
     });
 }
@@ -201,21 +214,47 @@ function showDetailedStrategicIndicators (titles, ids, labels, values) {
         ctx.getContext("2d");
         if (labels[i].length === 2) {
             labels[i].push(null);
-            //values[i].push(null);
+        } else if (labels[i].length === 1) {
+            labels[i].push(null);
+            labels[i].push(null);
+        }
+        var dataset = [];
+        dataset.push({
+            label: titles[i],
+            backgroundColor: 'rgba(105, 105, 105, 0.2)',
+            borderColor: currentColor,
+            pointBackgroundColor: currentColor,
+            pointBorderColor: currentColor,
+            data: values[i],
+            fill: false
+        });
+        var cat = categories;
+        cat.sort(function (a, b) {
+            return b.upperThreshold - a.upperThreshold;
+        });
+        for (var k = cat.length-1; k >= 0; --k) {
+            var fill = cat.length-1-k;
+            if (k == cat.length-1) fill = true;
+            dataset.push({
+                label: cat[k].name,
+                borderWidth: 1,
+                backgroundColor: hexToRgbA(cat[k].color, 0.3),
+                borderColor: hexToRgbA(cat[k].color, 0.3),
+                pointHitRadius: 0,
+                pointHoverRadius: 0,
+                pointRadius: 0,
+                pointBorderWidth: 0,
+                pointBackgroundColor: 'rgba(0, 0, 0, 0)',
+                pointBorderColor: 'rgba(0, 0, 0, 0)',
+                data: [].fill.call({ length: labels[i].length }, cat[k].upperThreshold),
+                fill: fill
+            })
         }
         var chart = new Chart(ctx, {    //draw chart with the following config
             type: 'radar',
             data: {
                 labels: labels[i],
-                datasets: [{
-                    label: titles[i],
-                    backgroundColor: 'rgba(105, 105, 105, 0.2)',
-                    borderColor: currentColor,
-                    pointBackgroundColor: currentColor,
-                    pointBorderColor: currentColor,
-                    data: values[i],
-                    fill: true
-                }]
+                datasets: dataset
             },
             options: {
                 title: {
@@ -236,6 +275,7 @@ function showDetailedStrategicIndicators (titles, ids, labels, values) {
                 }
             }
         });
+        console.log(chart);
         detailedCharts.push(chart);
         window.myLine = chart;
     }
@@ -263,7 +303,7 @@ $('#apply').click(function () {
             pointBackgroundColor: simulationColor,
             pointBorderColor: simulationColor,
             data: [],
-            fill: true
+            fill: false
         };
         for (var j = 0; j < strategicIndicator.factors.length; j++) {
             var factor = strategicIndicator.factors[j];
@@ -272,11 +312,14 @@ $('#apply').click(function () {
             });
             dataset.data.push(newFactor.value);
         }
-
-        if (detailedCharts[i].data.datasets.length > 1)
+        if (detailedCharts[i].data.datasets.length > 4) {
             detailedCharts[i].data.datasets[0].data = dataset.data;
-        else
+        } else {
             detailedCharts[i].data.datasets.unshift(dataset);
+            // change categories fill property (we add simulated data)
+            detailedCharts[i].data.datasets[3].fill = detailedCharts[i].data.datasets[3].fill +1;
+            detailedCharts[i].data.datasets[4].fill = detailedCharts[i].data.datasets[4].fill +1;
+        }
         detailedCharts[i].update();
     }
 
@@ -309,14 +352,30 @@ $('#restore').click(function () {
 
 function removeSimulation() {
     d3.selectAll('.simulation').remove();
-    if (detailedCharts[0].data.datasets.length > 1) {
+    if (detailedCharts[0].data.datasets.length > 4) {
         for (var i = 0; i < detailedCharts.length; i++) {
             detailedCharts[i].data.datasets.shift();
+            // change categories fill property (we remove simulated data)
+            detailedCharts[i].data.datasets[2].fill = detailedCharts[i].data.datasets[2].fill -1;
+            detailedCharts[i].data.datasets[3].fill = detailedCharts[i].data.datasets[3].fill -1;
             detailedCharts[i].update();
         }
     }
 }
 
+function hexToRgbA(hex,a=1){ // (hex color, opacity)
+    var c;
+    if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){
+        c= hex.substring(1).split('');
+        if(c.length== 3){
+            c= [c[0], c[0], c[1], c[1], c[2], c[2]];
+        }
+        c= '0x'+c.join('');
+        return 'rgba('+[(c>>16)&255, (c>>8)&255, c&255].join(',')+','+ a +')';
+    }
+    throw new Error('Bad Hex');
+}
+
 window.onload = function() {
     $("#simulationColor").css("background-color", simulationColor);
     $("#simulationColorDetailed").css("background-color", simulationColor);
diff --git a/src/main/resources/static/js/simulationMetrics.js b/src/main/resources/static/js/simulationMetrics.js
index 42076f7d..92c0f882 100644
--- a/src/main/resources/static/js/simulationMetrics.js
+++ b/src/main/resources/static/js/simulationMetrics.js
@@ -32,6 +32,30 @@ function getMetricsCategoriesAndShow () {
     });
 }
 
+function getMetricsCategories (titles, ids, labels, values) {
+    var url = "../api/metrics/categories";
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            categories = response;
+            showFactors(titles, ids, labels, values);
+        }
+    });
+}
+
+function getFactorsCategories (titles, ids, labels, values) {
+    var url = "../api/qualityFactors/categories";
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            categories = response;
+            showDetailedStrategicIndicators(titles, ids, labels, values)
+        }
+    });
+}
+
 function showMetricsSliders () {
     // Metrics categories
     var rangeHighlights = [];
@@ -154,7 +178,7 @@ function getDetailedStrategicIndicators () {
                     });
                 }
             }
-            showDetailedStrategicIndicators(titles, ids, labels, values);
+            getFactorsCategories (titles, ids, labels, values);
         }
     });
 }
@@ -179,19 +203,43 @@ function showDetailedStrategicIndicators (titles, ids, labels, values) {
             labels[i].push(null);
             //values[i].push(null);
         }
+        var dataset = [];
+        dataset.push({
+            label: titles[i],
+            backgroundColor: 'rgba(105, 105, 105, 0.2)',
+            borderColor: currentColor,
+            pointBackgroundColor: currentColor,
+            pointBorderColor: currentColor,
+            data: values[i],
+            fill: false
+        });
+        var cat = categories;
+        cat.sort(function (a, b) {
+            return b.upperThreshold - a.upperThreshold;
+        });
+        for (var k = cat.length-1; k >= 0; --k) {
+            var fill = cat.length-1-k;
+            if (k == cat.length-1) fill = true;
+            dataset.push({
+                label: cat[k].name,
+                borderWidth: 1,
+                backgroundColor: hexToRgbA(cat[k].color, 0.3),
+                borderColor: hexToRgbA(cat[k].color, 0.3),
+                pointHitRadius: 0,
+                pointHoverRadius: 0,
+                pointRadius: 0,
+                pointBorderWidth: 0,
+                pointBackgroundColor: 'rgba(0, 0, 0, 0)',
+                pointBorderColor: 'rgba(0, 0, 0, 0)',
+                data: [].fill.call({ length: labels[i].length }, cat[k].upperThreshold),
+                fill: fill
+            })
+        }
         var chart = new Chart(ctx, {    //draw chart with the following config
             type: 'radar',
             data: {
                 labels: labels[i],
-                datasets: [{
-                    label: titles[i],
-                    backgroundColor: 'rgba(105, 105, 105, 0.2)',
-                    borderColor: currentColor,
-                    pointBackgroundColor: currentColor,
-                    pointBorderColor: currentColor,
-                    data: values[i],
-                    fill: true
-                }]
+                datasets: dataset
             },
             options: {
                 title: {
@@ -254,7 +302,8 @@ function getFactors () {
                 }
             }
             checkMetricsSliders();
-            showFactors(titles, ids, labels, values);
+            getMetricsCategories(titles, ids, labels, values);
+            //showFactors(titles, ids, labels, values);
         }
     });
 }
@@ -300,21 +349,47 @@ function showFactors (titles, ids, labels, values) {
         ctx.getContext("2d");
         if (labels[i].length === 2) {
             labels[i].push(null);
-            //values[i].push(null);
+        } else if (labels[i].length === 1) {
+            labels[i].push(null);
+            labels[i].push(null);
+        }
+        var dataset = [];
+        dataset.push({
+            label: titles[i],
+            backgroundColor: 'rgba(105, 105, 105, 0.2)',
+            borderColor: currentColor,
+            pointBackgroundColor: currentColor,
+            pointBorderColor: currentColor,
+            data: values[i],
+            fill: false
+        });
+        var cat = categories;
+        cat.sort(function (a, b) {
+            return b.upperThreshold - a.upperThreshold;
+        });
+        for (var k = cat.length-1; k >= 0; --k) {
+            var fill = cat.length-1-k;
+            if (k == cat.length-1) fill = true;
+            dataset.push({
+                label: cat[k].name,
+                borderWidth: 1,
+                backgroundColor: hexToRgbA(cat[k].color, 0.3),
+                borderColor: hexToRgbA(cat[k].color, 0.3),
+                pointHitRadius: 0,
+                pointHoverRadius: 0,
+                pointRadius: 0,
+                pointBorderWidth: 0,
+                pointBackgroundColor: 'rgba(0, 0, 0, 0)',
+                pointBorderColor: 'rgba(0, 0, 0, 0)',
+                data: [].fill.call({ length: labels[i].length }, cat[k].upperThreshold),
+                fill: fill
+            })
         }
         var chart = new Chart(ctx, {    //draw chart with the following config
             type: 'radar',
             data: {
                 labels: labels[i],
-                datasets: [{
-                    label: titles[i],
-                    backgroundColor: 'rgba(105, 105, 105, 0.2)',
-                    borderColor: currentColor,
-                    pointBackgroundColor: currentColor,
-                    pointBorderColor: currentColor,
-                    data: values[i],
-                    fill: true
-                }]
+                datasets: dataset
             },
             options: {
                 title: {
@@ -335,6 +410,7 @@ function showFactors (titles, ids, labels, values) {
                 }
             }
         });
+        console.log(chart);
         factorsCharts.push(chart);
         window.myLine = chart;
     }
@@ -360,7 +436,7 @@ $('#apply').click(function () {
             pointBackgroundColor: simulationColor,
             pointBorderColor: simulationColor,
             data: [],
-            fill: true
+            fill: false
         };
         for (var j = 0; j < qualityFactor.metrics.length; j++) {
             var metric = qualityFactor.metrics[j];
@@ -370,10 +446,14 @@ $('#apply').click(function () {
             dataset.data.push(newMetric.value);
         }
 
-        if (factorsCharts[i].data.datasets.length > 1)
+        if (factorsCharts[i].data.datasets.length > 4)
             factorsCharts[i].data.datasets[0].data = dataset.data;
-        else
+        else {
             factorsCharts[i].data.datasets.unshift(dataset);
+            // change categories fill property (we add simulated data)
+            factorsCharts[i].data.datasets[3].fill = factorsCharts[i].data.datasets[3].fill +1;
+            factorsCharts[i].data.datasets[4].fill = factorsCharts[i].data.datasets[4].fill +1;
+        }
         factorsCharts[i].update();
     }
 
@@ -404,7 +484,7 @@ $('#apply').click(function () {
                     pointBackgroundColor: simulationColor,
                     pointBorderColor: simulationColor,
                     data: [],
-                    fill: true
+                    fill: false
                 };
                 for (var j = 0; j < strategicIndicator.factors.length; j++) {
                     var factor = strategicIndicator.factors[j];
@@ -415,10 +495,14 @@ $('#apply').click(function () {
                         dataset.data.push(newFactor.value);
                 }
 
-                if (detailedCharts[i].data.datasets.length > 1)
+                if (detailedCharts[i].data.datasets.length > 4)
                     detailedCharts[i].data.datasets[0].data = dataset.data;
-                else
+                else {
                     detailedCharts[i].data.datasets.unshift(dataset);
+                    // change categories fill property (we add simulated data)
+                    detailedCharts[i].data.datasets[3].fill = detailedCharts[i].data.datasets[3].fill +1;
+                    detailedCharts[i].data.datasets[4].fill = detailedCharts[i].data.datasets[4].fill +1;
+                }
                 detailedCharts[i].update();
             }
             simulateSI(qualityFactors);
@@ -469,20 +553,39 @@ $('#restore').click(function () {
 
 function removeSimulation() {
     d3.selectAll('.simulation').remove();
-    if (factorsCharts[0].data.datasets.length > 1) {
+    if (factorsCharts[0].data.datasets.length > 4) {
         for (var i = 0; i < factorsCharts.length; i++) {
             factorsCharts[i].data.datasets.shift();
+            // change categories fill property (we remove simulated data)
+            factorsCharts[i].data.datasets[2].fill = factorsCharts[i].data.datasets[2].fill -1;
+            factorsCharts[i].data.datasets[3].fill = factorsCharts[i].data.datasets[3].fill -1;
             factorsCharts[i].update();
         }
     }
-    if (detailedCharts[0].data.datasets.length > 1) {
+    if (detailedCharts[0].data.datasets.length > 4) {
         for (var i = 0; i < detailedCharts.length; i++) {
             detailedCharts[i].data.datasets.shift();
+            // change categories fill property (we remove simulated data)
+            detailedCharts[i].data.datasets[2].fill = detailedCharts[i].data.datasets[2].fill -1;
+            detailedCharts[i].data.datasets[3].fill = detailedCharts[i].data.datasets[3].fill -1;
             detailedCharts[i].update();
         }
     }
 }
 
+function hexToRgbA(hex,a=1){ // (hex color, opacity)
+    var c;
+    if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){
+        c= hex.substring(1).split('');
+        if(c.length== 3){
+            c= [c[0], c[0], c[1], c[1], c[2], c[2]];
+        }
+        c= '0x'+c.join('');
+        return 'rgba('+[(c>>16)&255, (c>>8)&255, c&255].join(',')+','+ a +')';
+    }
+    throw new Error('Bad Hex');
+}
+
 window.onload = function() {
     $("#simulationColor").css("background-color", simulationColor);
     $("#simulationColorDetailed").css("background-color", simulationColor);
diff --git a/src/main/resources/static/js/simulationQR.js b/src/main/resources/static/js/simulationQR.js
index 04c175f5..550d8d00 100644
--- a/src/main/resources/static/js/simulationQR.js
+++ b/src/main/resources/static/js/simulationQR.js
@@ -13,6 +13,30 @@ var categories = [];
 var alertId;
 var patternId;
 
+function getFactorsCategories (titles, ids, labels, values) {
+    var url = "../api/qualityFactors/categories";
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            categories = response;
+            showDetailedStrategicIndicators(titles, ids, labels, values)
+        }
+    });
+}
+
+function getMetricsCategories (titles, ids, labels, values) {
+    var url = "../api/metrics/categories";
+    $.ajax({
+        url : url,
+        type: "GET",
+        success: function (response) {
+            categories = response;
+            showFactors(titles, ids, labels, values);
+        }
+    });
+}
+
 function getDetailedStrategicIndicators () {
     jQuery.ajax({
         dataType: "json",
@@ -55,7 +79,8 @@ function getDetailedStrategicIndicators () {
                     });
                 }
             }
-            showDetailedStrategicIndicators(titles, ids, labels, values);
+            getFactorsCategories (titles, ids, labels, values);
+            //showDetailedStrategicIndicators(titles, ids, labels, values);
         }
     });
 }
@@ -80,19 +105,43 @@ function showDetailedStrategicIndicators (titles, ids, labels, values) {
             labels[i].push(null);
             //values[i].push(null);
         }
+        var dataset = [];
+        dataset.push({
+            label: titles[i],
+            backgroundColor: 'rgba(105, 105, 105, 0.2)',
+            borderColor: currentColor,
+            pointBackgroundColor: currentColor,
+            pointBorderColor: currentColor,
+            data: values[i],
+            fill: false
+        });
+        var cat = categories;
+        cat.sort(function (a, b) {
+            return b.upperThreshold - a.upperThreshold;
+        });
+        for (var k = cat.length-1; k >= 0; --k) {
+            var fill = cat.length-1-k;
+            if (k == cat.length-1) fill = true;
+            dataset.push({
+                label: cat[k].name,
+                borderWidth: 1,
+                backgroundColor: hexToRgbA(cat[k].color, 0.3),
+                borderColor: hexToRgbA(cat[k].color, 0.3),
+                pointHitRadius: 0,
+                pointHoverRadius: 0,
+                pointRadius: 0,
+                pointBorderWidth: 0,
+                pointBackgroundColor: 'rgba(0, 0, 0, 0)',
+                pointBorderColor: 'rgba(0, 0, 0, 0)',
+                data: [].fill.call({ length: labels[i].length }, cat[k].upperThreshold),
+                fill: fill
+            })
+        }
         var chart = new Chart(ctx, {    //draw chart with the following config
             type: 'radar',
             data: {
                 labels: labels[i],
-                datasets: [{
-                    label: titles[i],
-                    backgroundColor: 'rgba(105, 105, 105, 0.2)',
-                    borderColor: currentColor,
-                    pointBackgroundColor: currentColor,
-                    pointBorderColor: currentColor,
-                    data: values[i],
-                    fill: true
-                }]
+                datasets: dataset
             },
             options: {
                 title: {
@@ -155,8 +204,9 @@ function getFactors () {
                     });
                 }
             }
-            showFactors(titles, ids, labels, values);
+            //showFactors(titles, ids, labels, values);
             checkMetricsSliders();
+            getMetricsCategories(titles, ids, labels, values);
         }
     });
 }
@@ -202,21 +252,47 @@ function showFactors (titles, ids, labels, values) {
         ctx.getContext("2d");
         if (labels[i].length === 2) {
             labels[i].push(null);
-            //values[i].push(null);
+        } else if (labels[i].length === 1) {
+            labels[i].push(null);
+            labels[i].push(null);
+        }
+        var dataset = [];
+        dataset.push({
+            label: titles[i],
+            backgroundColor: 'rgba(105, 105, 105, 0.2)',
+            borderColor: currentColor,
+            pointBackgroundColor: currentColor,
+            pointBorderColor: currentColor,
+            data: values[i],
+            fill: false
+        });
+        var cat = categories;
+        cat.sort(function (a, b) {
+            return b.upperThreshold - a.upperThreshold;
+        });
+        for (var k = cat.length-1; k >= 0; --k) {
+            var fill = cat.length-1-k;
+            if (k == cat.length-1) fill = true;
+            dataset.push({
+                label: cat[k].name,
+                borderWidth: 1,
+                backgroundColor: hexToRgbA(cat[k].color, 0.3),
+                borderColor: hexToRgbA(cat[k].color, 0.3),
+                pointHitRadius: 0,
+                pointHoverRadius: 0,
+                pointRadius: 0,
+                pointBorderWidth: 0,
+                pointBackgroundColor: 'rgba(0, 0, 0, 0)',
+                pointBorderColor: 'rgba(0, 0, 0, 0)',
+                data: [].fill.call({ length: labels[i].length }, cat[k].upperThreshold),
+                fill: fill
+            })
         }
         var chart = new Chart(ctx, {    //draw chart with the following config
             type: 'radar',
             data: {
                 labels: labels[i],
-                datasets: [{
-                    label: titles[i],
-                    backgroundColor: 'rgba(105, 105, 105, 0.2)',
-                    borderColor: currentColor,
-                    pointBackgroundColor: currentColor,
-                    pointBorderColor: currentColor,
-                    data: values[i],
-                    fill: true
-                }]
+                datasets: dataset
             },
             options: {
                 title: {
@@ -456,15 +532,21 @@ $('#restore').click(function () {
 
 function removeSimulation() {
     d3.selectAll('.simulation').remove();
-    if (factorsCharts[0].data.datasets.length > 1) {
+    if (factorsCharts[0].data.datasets.length > 4) {
         for (var i = 0; i < factorsCharts.length; i++) {
             factorsCharts[i].data.datasets.shift();
+            // change categories fill property (we remove simulated data)
+            factorsCharts[i].data.datasets[2].fill = factorsCharts[i].data.datasets[2].fill -1;
+            factorsCharts[i].data.datasets[3].fill = factorsCharts[i].data.datasets[3].fill -1;
             factorsCharts[i].update();
         }
     }
-    if (detailedCharts[0].data.datasets.length > 1) {
+    if (detailedCharts[0].data.datasets.length > 4) {
         for (var i = 0; i < detailedCharts.length; i++) {
             detailedCharts[i].data.datasets.shift();
+            // change categories fill property (we remove simulated data)
+            detailedCharts[i].data.datasets[2].fill = detailedCharts[i].data.datasets[2].fill -1;
+            detailedCharts[i].data.datasets[3].fill = detailedCharts[i].data.datasets[3].fill -1;
             detailedCharts[i].update();
         }
     }
@@ -492,7 +574,7 @@ $('#apply').click(function () {
             pointBackgroundColor: simulationColor,
             pointBorderColor: simulationColor,
             data: [],
-            fill: true
+            fill: false
         };
         for (var j = 0; j < qualityFactor.metrics.length; j++) {
             var metric = qualityFactor.metrics[j];
@@ -503,10 +585,14 @@ $('#apply').click(function () {
             else dataset.data.push(metric.value);
         }
 
-        if (factorsCharts[i].data.datasets.length > 1)
+        if (factorsCharts[i].data.datasets.length > 4)
             factorsCharts[i].data.datasets[0].data = dataset.data;
-        else
+        else{
             factorsCharts[i].data.datasets.unshift(dataset);
+            // change categories fill property (we add simulated data)
+            factorsCharts[i].data.datasets[3].fill = factorsCharts[i].data.datasets[3].fill +1;
+            factorsCharts[i].data.datasets[4].fill = factorsCharts[i].data.datasets[4].fill +1;
+        }
         factorsCharts[i].update();
     }
 
@@ -536,7 +622,7 @@ $('#apply').click(function () {
                     pointBackgroundColor: simulationColor,
                     pointBorderColor: simulationColor,
                     data: [],
-                    fill: true
+                    fill: false
                 };
                 for (var j = 0; j < strategicIndicator.factors.length; j++) {
                     var factor = strategicIndicator.factors[j];
@@ -547,10 +633,14 @@ $('#apply').click(function () {
                         dataset.data.push(newFactor.value);
                 }
 
-                if (detailedCharts[i].data.datasets.length > 1)
+                if (detailedCharts[i].data.datasets.length > 4)
                     detailedCharts[i].data.datasets[0].data = dataset.data;
-                else
+                else {
                     detailedCharts[i].data.datasets.unshift(dataset);
+                    // change categories fill property (we add simulated data)
+                    detailedCharts[i].data.datasets[3].fill = detailedCharts[i].data.datasets[3].fill +1;
+                    detailedCharts[i].data.datasets[4].fill = detailedCharts[i].data.datasets[4].fill +1;
+                }
                 detailedCharts[i].update();
             }
             simulateSI(qualityFactors);
@@ -698,6 +788,19 @@ $('#decision').click(function () {
     });
 });
 
+function hexToRgbA(hex,a=1){ // (hex color, opacity)
+    var c;
+    if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){
+        c= hex.substring(1).split('');
+        if(c.length== 3){
+            c= [c[0], c[0], c[1], c[1], c[2], c[2]];
+        }
+        c= '0x'+c.join('');
+        return 'rgba('+[(c>>16)&255, (c>>8)&255, c&255].join(',')+','+ a +')';
+    }
+    throw new Error('Bad Hex');
+}
+
 window.onload = function () {
     $("#simulationColor").css("background-color", simulationColor);
     $("#simulationColorDetailed").css("background-color", simulationColor);
diff --git a/src/main/resources/static/js/stackedLineChart.js b/src/main/resources/static/js/stackedLineChart.js
index de87a47f..5ae57800 100644
--- a/src/main/resources/static/js/stackedLineChart.js
+++ b/src/main/resources/static/js/stackedLineChart.js
@@ -190,20 +190,22 @@ function drawChart() {
             var pointRadius = 3;
             var borderWidth = 1;
             var color = colors[j % colors.length];
+            // special logic to show decisions in historical views
             if (value[i][j][0] && value[i][j][0].y >= 1.1) {
                 showLine = false;
                 pointRadius = 5;
                 borderWidth = 2;
+                // on axis y = 1.1 is shown added decisions
                 if (value[i][j][0].y === 1.1) {
                     color = decisionAddColor;
                     pointStyle = 'cross';
                 }
+                // on axis y = 1.2 is shown ignored decisions
                 if (value[i][j][0].y === 1.2) {
                     color = decisionIgnoreColor;
                     pointStyle = 'crossRot';
                 }
             }
-
             c.data.datasets.push({
                 label: labels[i][j],
                 hidden: false,
@@ -281,25 +283,21 @@ function drawChart() {
         var a = document.createElement('a');
         var currentURL = window.location.href;
         if (isdsi) {  //if it is a Stacked Line Chart for Detailed Strategic Indicators
-            if (currentURL.match("/PredictionChart")) urlLink = "../QualityFactors/PredictionChart?id=" + ids[i] + "&name=" + texts[i];
-            else urlLink = "../QualityFactors/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
+            urlLink = "../QualityFactors/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
             a.setAttribute("href", urlLink);
         } else if (isqf) { //if it is a Stacked Line Chart for Quality Factors
             var name = getParameterByName('name');
             var id = getParameterByName('id');
             if (name.length != 0) {//if we know from which Detailed Strategic Indicator we are coming
-                if (currentURL.match("/PredictionChart")) urlLink = "../Metrics/PredictionChart?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + texts[i];
-                else urlLink = "../Metrics/HistoricChart?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + texts[i];
+                urlLink = "../Metrics/HistoricChart?id=" + ids[i] + "&si=" + name + "&siid=" + id + "&name=" + texts[i];
             }
             else {
-                if (currentURL.match("/PredictionChart")) urlLink = "../Metrics/PredictionChart?id=" + ids[i] + "&name=" + texts[i];
-                else urlLink = "../Metrics/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
+                urlLink = "../Metrics/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
             }
             a.setAttribute("href", urlLink);
         } else if (isSi) {
             //if its a SI chart make it a hyperlink
-            if (currentURL.match("/PredictionChart")) urlLink = "../DetailedStrategicIndicators/PredictionChart?id=" + ids[i] + "&name=" + texts[i];
-            else urlLink = "../DetailedStrategicIndicators/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
+            urlLink = "../DetailedStrategicIndicators/HistoricChart?id=" + ids[i] + "&name=" + texts[i];
             a.setAttribute("href", urlLink);
         }
         a.innerHTML = texts[i];
diff --git a/src/main/resources/templates/DetailedStrategicIndicators/PredictionChart.html b/src/main/resources/templates/DetailedStrategicIndicators/PredictionChart.html
index 95eb7746..3ad1e7a8 100644
--- a/src/main/resources/templates/DetailedStrategicIndicators/PredictionChart.html
+++ b/src/main/resources/templates/DetailedStrategicIndicators/PredictionChart.html
@@ -45,5 +45,5 @@ <h1 id="title" align="center"></h1>
 </body>
 <th:block th:replace="Fragments/TemplateDashboard :: scriptsHistoric"></th:block>
 <script type="text/javascript" src="../../static/js/parseDataDetailedSIPrediction.js.js.js" th:src="@{/js/parseDataDetailedSIPrediction.js}"></script>
-<script type="text/javascript" src="../../static/js/stackedLineChart.js.js" th:src="@{/js/stackedLineChart.js}"></script>
+<script type="text/javascript" src="../../static/js/stackedLineChart.js.js" th:src="@{/js/predictionLineChart.js}"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/Fragments/TemplateDashboard.html b/src/main/resources/templates/Fragments/TemplateDashboard.html
index 324f19b5..17901774 100644
--- a/src/main/resources/templates/Fragments/TemplateDashboard.html
+++ b/src/main/resources/templates/Fragments/TemplateDashboard.html
@@ -160,31 +160,51 @@
         <br/>
         <div class="pull-right" style="width: 100%; padding-right: 1em; padding-left: 1em;">
             <form class="form-inline well" style="float: right">
-                <div class="form-group" id="fitToContentDiv" style="margin-right: 10px">
-                    <input type="checkbox" class="form-check-input" id="fitToContent">
-                    <label class="control-label" for="fitToContent">Fit to content</label>
-                </div>
-                <div class="form-group dropdown" id="techniqueDropdownDiv">
-                    <label class="control-label">Technique: </label>
-                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                        <span id="selectedTechnique" th:text="${@environment.getProperty('forecast.technique')}"></span>
-                        <span class="caret"></span>
-                    </button>
-                    <ul id="techniqueDropdown" class="dropdown-menu dropdown-menu-right"></ul>
-                </div>
-                <div class="form-group" id="fromDiv">
-                    <label class="control-label">From: </label>
-                    <input id="datepickerFrom" width="250" class="form-control"/>
-                </div>
-                <div class="form-group">
-                    <label class="control-label"> To: </label>
-                    <input id="datepickerTo" width="250" class="form-control"/>
-                </div>
-                <button id="applyButton" type="button" class="btn btn-default">Apply</button>
-                <div class="form-group dropdown">
-                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Interval <span class="caret"></span></button>
-                    <ul id="intervalsDropdown" class="dropdown-menu dropdown-menu-right"></ul>
-                </div>
+                <table style="width:100%">
+                    <tr>
+                        <td>
+                            <div class="form-group" id="fitToContentDiv" style="margin-right: 10px">
+                                <input type="checkbox" class="form-check-input" id="fitToContent">
+                                <label class="control-label" for="fitToContent">Fit to content</label>
+                            </div>
+                        </td>
+                        <td rowspan="2">
+                            <div class="form-group dropdown" id="techniqueDropdownDiv">
+                                <label class="control-label">Technique: </label>
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                    <span id="selectedTechnique" th:text="${@environment.getProperty('forecast.technique')}"></span>
+                                    <span class="caret"></span>
+                                </button>
+                                <ul id="techniqueDropdown" class="dropdown-menu dropdown-menu-right"></ul>
+                            </div>
+                            <div class="form-group" id="fromDiv">
+                                <label class="control-label">From: </label>
+                                <input id="datepickerFrom" width="250" class="form-control"/>
+                            </div>
+                            <div class="form-group" id="current_dateDiv">
+                                <label class="control-label">Current: </label>
+                                <input id="datepickerCurrentDate" width="250" class="form-control"/>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label"> To: </label>
+                                <input id="datepickerTo" width="250" class="form-control"/>
+                            </div>
+                            <button id="applyButton" type="button" class="btn btn-default">Apply</button>
+                            <div class="form-group dropdown">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Interval <span class="caret"></span></button>
+                                <ul id="intervalsDropdown" class="dropdown-menu dropdown-menu-right"></ul>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div class="form-group" id="showConfidenceDiv" style="margin-right: 10px">
+                                <input type="checkbox" class="form-check-input" id="showConfidence">
+                                <label class="control-label" for="showConfidence">Show confidence intervals</label>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
             </form>
         </div>
         <br/>
diff --git a/src/main/resources/templates/Metrics/PredictionChart.html b/src/main/resources/templates/Metrics/PredictionChart.html
index a69aaf28..b108463d 100644
--- a/src/main/resources/templates/Metrics/PredictionChart.html
+++ b/src/main/resources/templates/Metrics/PredictionChart.html
@@ -45,5 +45,5 @@ <h1 id="title" align="center"></h1>
 </body>
 <th:block th:replace="Fragments/TemplateDashboard :: scriptsHistoric"></th:block>
 <script type="text/javascript" src="../../static/js/parseDataMetricsPrediction.js" th:src="@{/js/parseDataMetricsPrediction.js}"></script>
-<script type="text/javascript" src="../../static/js/stackedLineChart.js" th:src="@{/js/stackedLineChart.js}"></script>
+<script type="text/javascript" src="../../static/js/stackedLineChart.js" th:src="@{/js/predictionLineChart.js}"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/QualityFactors/PredictionChart.html b/src/main/resources/templates/QualityFactors/PredictionChart.html
index 2e24c180..1d7e9bc0 100644
--- a/src/main/resources/templates/QualityFactors/PredictionChart.html
+++ b/src/main/resources/templates/QualityFactors/PredictionChart.html
@@ -45,5 +45,5 @@ <h1 id="title" align="center"></h1>
 </body>
 <th:block th:replace="Fragments/TemplateDashboard :: scriptsHistoric"></th:block>
 <script type="text/javascript" src="../../static/js/parseDataQFPrediction.js.js" th:src="@{/js/parseDataQFPrediction.js}"></script>
-<script type="text/javascript" src="../../static/js/stackedLineChart.js.js" th:src="@{/js/stackedLineChart.js}"></script>
+<script type="text/javascript" src="../../static/js/stackedLineChart.js.js" th:src="@{/js/predictionLineChart.js}"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/StrategicIndicators/PredictionChart.html b/src/main/resources/templates/StrategicIndicators/PredictionChart.html
index b7229f05..e7912ede 100644
--- a/src/main/resources/templates/StrategicIndicators/PredictionChart.html
+++ b/src/main/resources/templates/StrategicIndicators/PredictionChart.html
@@ -42,5 +42,5 @@
 </body>
 <th:block th:replace="Fragments/TemplateDashboard :: scriptsHistoric"></th:block>
 <script type="text/javascript" src="../../static/js/parseDataSIPrediction.js.js.js" th:src="@{/js/parseDataSIPrediction.js}"></script>
-<script type="text/javascript" src="../../static/js/stackedLineChart.js.js" th:src="@{/js/stackedLineChart.js}"></script>
+<script type="text/javascript" src="../../static/js/stackedLineChart.js.js" th:src="@{/js/predictionLineChart.js}"></script>
 </html>
\ No newline at end of file
diff --git a/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java b/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java
index cbcadaae..64268ab2 100644
--- a/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java
+++ b/src/test/java/com/upc/gessi/qrapids/app/domain/controllers/StrategicIndicatorsControllerTest.java
@@ -419,17 +419,29 @@ public void getSingleDetailedStrategicIndicatorsHistoricalEvaluation() throws IO
     @Test
     public void getStrategicIndicatorsPrediction() throws IOException {
         // Given
+        DTOStrategicIndicatorEvaluation dtoStrategicIndicatorEvaluation = domainObjectsBuilder.buildDTOStrategicIndicatorEvaluation();
+        dtoStrategicIndicatorEvaluation.setDatasource("Forecast");
+        dtoStrategicIndicatorEvaluation.setRationale("Forecast");
+        float first80 = 0.97473043f;
+        float second80 = 0.9745246f;
+        Pair<Float, Float> confidence80 = Pair.of(first80, second80);
+        dtoStrategicIndicatorEvaluation.setConfidence80(confidence80);
+        float first95 = 0.9747849f;
+        float second95 = 0.97447014f;
+        Pair<Float, Float> confidence95 = Pair.of(first95, second95);
+        dtoStrategicIndicatorEvaluation.setConfidence95(confidence95);
+        List<DTOStrategicIndicatorEvaluation> dtoStrategicIndicatorEvaluationList = new ArrayList<>();
+        dtoStrategicIndicatorEvaluationList.add(dtoStrategicIndicatorEvaluation);
+
         String projectExternalId = "test";
         String technique = "PROPHET";
         String horizon = "7";
         String freq = "7";
-        DTOStrategicIndicatorEvaluation dtoStrategicIndicatorEvaluation = domainObjectsBuilder.buildDTOStrategicIndicatorEvaluation();
-        List<DTOStrategicIndicatorEvaluation> dtoStrategicIndicatorEvaluationList = new ArrayList<>();
-        dtoStrategicIndicatorEvaluationList.add(dtoStrategicIndicatorEvaluation);
-        when(qmaForecast.ForecastSI(technique, freq, horizon, projectExternalId)).thenReturn(dtoStrategicIndicatorEvaluationList);
+
+        when(qmaForecast.ForecastSI(dtoStrategicIndicatorEvaluationList,technique, freq, horizon, projectExternalId)).thenReturn(dtoStrategicIndicatorEvaluationList);
 
         // When
-        List<DTOStrategicIndicatorEvaluation> dtoStrategicIndicatorEvaluationListFound = strategicIndicatorsController.getStrategicIndicatorsPrediction(technique, freq, horizon, projectExternalId);
+        List<DTOStrategicIndicatorEvaluation> dtoStrategicIndicatorEvaluationListFound = strategicIndicatorsController.getStrategicIndicatorsPrediction(dtoStrategicIndicatorEvaluationList, technique, freq, horizon, projectExternalId);
 
         // Then
         assertEquals(dtoStrategicIndicatorEvaluationList.size(), dtoStrategicIndicatorEvaluationListFound.size());
@@ -498,7 +510,7 @@ public void trainForecastModelsAllProjects() throws IOException, CategoriesExcep
     }
 
     @Test
-    public void trainForecastModelsSingleProject() throws IOException {
+    public void trainForecastModelsSingleProject() throws IOException, CategoriesException {
         // Given
         String projectExternalId = "test";
 
@@ -514,6 +526,12 @@ public void trainForecastModelsSingleProject() throws IOException {
 
         when(qualityFactorsController.getAllFactorsWithMetricsCurrentEvaluation(projectExternalId)).thenReturn(dtoQualityFactorList);
 
+        DTOStrategicIndicatorEvaluation dtoStrategicIndicator = domainObjectsBuilder.buildDTOStrategicIndicatorEvaluation();
+        List<DTOStrategicIndicatorEvaluation> dtoStrategicIndicatorList = new ArrayList<>();
+        dtoStrategicIndicatorList.add(dtoStrategicIndicator);
+
+        when(strategicIndicatorsController.getAllStrategicIndicatorsCurrentEvaluation(projectExternalId)).thenReturn(dtoStrategicIndicatorList);
+
         String technique = "PROPHET";
 
         // When
@@ -522,6 +540,7 @@ public void trainForecastModelsSingleProject() throws IOException {
         // Then
         verify(qmaForecast, times(1)).trainMetricForecast(dtoMetricList, "7", projectExternalId, technique);
         verify(qmaForecast, times(1)).trainFactorForecast(dtoQualityFactorList, "7", projectExternalId, technique);
+        verify(qmaForecast, times(1)).trainStrategicIndicatorForecast(dtoStrategicIndicatorList, "7", projectExternalId, technique);
     }
 
     @Test
diff --git a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProductsTest.java b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProductsTest.java
index b9947692..11c1383e 100644
--- a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProductsTest.java
+++ b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/ProductsTest.java
@@ -731,6 +731,8 @@ public void getProductEvaluation() throws Exception {
                 .andExpect(jsonPath("$[0].description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$[0].value.first", is(getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$[0].value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$[0].confidence80", is(nullValue())))
+                .andExpect(jsonPath("$[0].confidence95", is(nullValue())))
                 .andExpect(jsonPath("$[0].value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$[0].rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$[0].probabilities", hasSize(3)))
@@ -778,6 +780,10 @@ public void getProductEvaluation() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("[].value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("[].confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("[].confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
                                 fieldWithPath("[].value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("[].rationale")
@@ -887,6 +893,8 @@ public void getDetailedCurrentEvaluation() throws Exception {
                 .andExpect(jsonPath("$[0].second[0].description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$[0].second[0].value.first", is(getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$[0].second[0].value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$[0].second[0].confidence80", is(nullValue())))
+                .andExpect(jsonPath("$[0].second[0].confidence95", is(nullValue())))
                 .andExpect(jsonPath("$[0].second[0].value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$[0].second[0].rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$[0].second[0].probabilities", hasSize(3)))
@@ -938,6 +946,10 @@ public void getDetailedCurrentEvaluation() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("[].second[].value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("[].second[].confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("[].second[].confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
                                 fieldWithPath("[].second[].value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("[].second[].rationale")
diff --git a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactorsTest.java b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactorsTest.java
index da8a0982..53e9da3a 100644
--- a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactorsTest.java
+++ b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/QualityFactorsTest.java
@@ -28,6 +28,7 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
+import java.io.IOException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicatorsTest.java b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicatorsTest.java
index 14ecb5b9..030a2585 100644
--- a/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicatorsTest.java
+++ b/src/test/java/com/upc/gessi/qrapids/app/presentation/rest/services/StrategicIndicatorsTest.java
@@ -162,6 +162,8 @@ public void getStrategicIndicatorsCurrentEvaluation() throws Exception {
                 .andExpect(jsonPath("$[0].description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$[0].value.first", is(getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$[0].value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$[0].confidence80", is(nullValue())))
+                .andExpect(jsonPath("$[0].confidence95", is(nullValue())))
                 .andExpect(jsonPath("$[0].value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$[0].rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$[0].probabilities", hasSize(3)))
@@ -209,6 +211,10 @@ public void getStrategicIndicatorsCurrentEvaluation() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("[].value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("[].confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("[].confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
                                 fieldWithPath("[].value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("[].rationale")
@@ -303,6 +309,8 @@ public void getSingleStrategicIndicatorCurrentEvaluation() throws Exception {
                 .andExpect(jsonPath("$.description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$.value.first", is(getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$.value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$.confidence80", is(nullValue())))
+                .andExpect(jsonPath("$.confidence95", is(nullValue())))
                 .andExpect(jsonPath("$.value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$.rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$.probabilities", hasSize(3)))
@@ -353,6 +361,10 @@ public void getSingleStrategicIndicatorCurrentEvaluation() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
                                 fieldWithPath("value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("rationale")
@@ -453,6 +465,8 @@ public void getStrategicIndicatorsHistoricalData() throws Exception {
                 .andExpect(jsonPath("$[0].description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$[0].value.first", is(getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$[0].value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$[0].confidence80", is(nullValue())))
+                .andExpect(jsonPath("$[0].confidence95", is(nullValue())))
                 .andExpect(jsonPath("$[0].value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$[0].rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$[0].probabilities", hasSize(3)))
@@ -504,6 +518,10 @@ public void getStrategicIndicatorsHistoricalData() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("[].value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("[].confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("[].confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
                                 fieldWithPath("[].value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("[].rationale")
@@ -1272,10 +1290,23 @@ public void getStrategicIndicatorsPrediction() throws Exception {
         dtoStrategicIndicatorEvaluation.getProbabilities().get(1).setValue(0.2f);
         dtoStrategicIndicatorEvaluation.getProbabilities().get(2).setValue(0f);
 
+        dtoStrategicIndicatorEvaluation.setDatasource("Forecast");
+        dtoStrategicIndicatorEvaluation.setRationale("Forecast");
+        Double first80 = 0.97473043;
+        Double second80 = 0.9745246;
+        Pair<Float, Float> confidence80 = Pair.of(first80.floatValue(), second80.floatValue());
+        dtoStrategicIndicatorEvaluation.setConfidence80(confidence80);
+        Double first95 = 0.9747849;
+        Double second95 = 0.97447014;
+        Pair<Float, Float> confidence95 = Pair.of(first95.floatValue(), second95.floatValue());
+        dtoStrategicIndicatorEvaluation.setConfidence95(confidence95);
+
         String technique = "PROPHET";
         String horizon = "7";
         String freq = "7";
-        when(strategicIndicatorsDomainController.getStrategicIndicatorsPrediction(technique, freq, horizon, projectExternalId)).thenReturn(dtoStrategicIndicatorEvaluationList);
+
+        when(strategicIndicatorsDomainController.getAllStrategicIndicatorsCurrentEvaluation(projectExternalId)).thenReturn(dtoStrategicIndicatorEvaluationList);
+        when(strategicIndicatorsDomainController.getStrategicIndicatorsPrediction(dtoStrategicIndicatorEvaluationList, technique, freq, horizon, projectExternalId)).thenReturn(dtoStrategicIndicatorEvaluationList);
 
         // Perform request
         RequestBuilder requestBuilder = MockMvcRequestBuilders
@@ -1293,6 +1324,11 @@ public void getStrategicIndicatorsPrediction() throws Exception {
                 .andExpect(jsonPath("$[0].description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$[0].value.first", is(getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$[0].value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$[0].confidence80.first", is(first80)))
+                .andExpect(jsonPath("$[0].confidence80.second", is(second80)))
+                .andExpect(jsonPath("$[0].confidence95.first", is(first95)))
+                .andExpect(jsonPath("$[0].confidence95.second", is(second95)))
+                .andExpect(jsonPath("$[0].forecastingError", is(nullValue())))
                 .andExpect(jsonPath("$[0].value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$[0].rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$[0].probabilities", hasSize(3)))
@@ -1344,6 +1380,18 @@ public void getStrategicIndicatorsPrediction() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("[].value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("[].confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("[].confidence80.first")
+                                        .description("Strategic indicator forecasting 80% confidence interval higher values"),
+                                fieldWithPath("[].confidence80.second")
+                                        .description("Strategic indicator forecasting 80% confidence interval lower values"),
+                                fieldWithPath("[].confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
+                                fieldWithPath("[].confidence95.first")
+                                        .description("Strategic indicator forecasting 95% confidence interval higher values"),
+                                fieldWithPath("[].confidence95.second")
+                                        .description("Strategic indicator forecasting 95% confidence interval lower values"),
                                 fieldWithPath("[].value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("[].rationale")
@@ -1379,7 +1427,8 @@ public void getStrategicIndicatorsPrediction() throws Exception {
                 ));
 
         // Verify mock interactions
-        verify(strategicIndicatorsDomainController, times(1)).getStrategicIndicatorsPrediction(technique, freq, horizon, projectExternalId);
+        verify(strategicIndicatorsDomainController, times(1)).getAllStrategicIndicatorsCurrentEvaluation(projectExternalId);
+        verify(strategicIndicatorsDomainController, times(1)).getStrategicIndicatorsPrediction(dtoStrategicIndicatorEvaluationList, technique, freq, horizon, projectExternalId);
         verifyNoMoreInteractions(strategicIndicatorsDomainController);
     }
 
@@ -2412,6 +2461,8 @@ public void simulate() throws Exception {
                 .andExpect(jsonPath("$[0].description", is(dtoStrategicIndicatorEvaluation.getDescription())))
                 .andExpect(jsonPath("$[0].value.first", is(HelperFunctions.getFloatAsDouble(dtoStrategicIndicatorEvaluation.getValue().getFirst()))))
                 .andExpect(jsonPath("$[0].value.second", is(dtoStrategicIndicatorEvaluation.getValue().getSecond())))
+                .andExpect(jsonPath("$[0].confidence80", is(nullValue())))
+                .andExpect(jsonPath("$[0].confidence95", is(nullValue())))
                 .andExpect(jsonPath("$[0].value_description", is(dtoStrategicIndicatorEvaluation.getValue_description())))
                 .andExpect(jsonPath("$[0].rationale", is(dtoStrategicIndicatorEvaluation.getRationale())))
                 .andExpect(jsonPath("$[0].probabilities", hasSize(3)))
@@ -2459,6 +2510,10 @@ public void simulate() throws Exception {
                                         .description("Strategic indicator numerical value"),
                                 fieldWithPath("[].value.second")
                                         .description("Strategic indicator category"),
+                                fieldWithPath("[].confidence80")
+                                        .description("Strategic indicator forecasting 80% confidence interval"),
+                                fieldWithPath("[].confidence95")
+                                        .description("Strategic indicator forecasting 95% confidence interval"),
                                 fieldWithPath("[].value_description")
                                         .description("Readable strategic indicator value and category"),
                                 fieldWithPath("[].rationale")