diff --git a/.vs/AAMariam-Plotter/v15/.suo b/.vs/AAMariam-Plotter/v15/.suo
index e587ee6e3..c558203f3 100644
Binary files a/.vs/AAMariam-Plotter/v15/.suo and b/.vs/AAMariam-Plotter/v15/.suo differ
diff --git a/History.js b/History.js
index 9d4ed88fb..1fa7fb78c 100644
--- a/History.js
+++ b/History.js
@@ -80,6 +80,8 @@
 
         timePeriod = pTimePeriod;
 
+        recalculate();
+
     }
 
     function setDatetime(newDatetime) {
@@ -98,7 +100,21 @@
 
     function recalculate() {    
 
-        for (let i = 0; i < file.length; i++) {
+        if (file === undefined) { return; }
+
+        /*
+
+        We are going to filter the records depending on the Time Period. We want that for a 1 min time peroid all the records appears on screen,
+        but for higher periods, we will filter out some records, so that they do not overlap ever. 
+
+        */
+
+        history = [];
+
+        let oneMin = 60000;
+        let step = timePeriod / oneMin;
+
+        for (let i = 0; i < file.length; i = i + step) {
 
             let newHistoryRecord = {
 
@@ -185,58 +201,83 @@
 
                 let dateValue = datetime.valueOf();
 
-                if (dateValue >= record.date - 30000  && dateValue + 30000 - 1 <= record.date) {
+                if (dateValue >= record.date - timePeriod / 2 && dateValue <= record.date + timePeriod / 2 - 1) {
 
-                    /* highlight the current record */
-
-                    browserCanvasContext.fillStyle = 'rgba(255, 233, 31, 1)'; // Current record accroding to time
                     isCurrentRecord = true;
 
                 } 
             } 
 
             let radiusFactor = 3;
+            let opacity = '0.2';
 
             let radius1 = record.newPositions * radiusFactor;
             let radius2 = radius1 + record.movedPositions * radiusFactor;
             let radius3 = radius2 + record.newTrades * radiusFactor;
 
+            /* Outer Circle */
+
             browserCanvasContext.beginPath();
 
+            browserCanvasContext.strokeStyle = 'rgba(27, 105, 7, ' + opacity + ')';
+
             if (isCurrentRecord === false) {
 
-                browserCanvasContext.strokeStyle = 'rgba(27, 105, 7, 1)';
-                browserCanvasContext.fillStyle = 'rgba(64, 217, 26, 1)';
+                browserCanvasContext.fillStyle = 'rgba(64, 217, 26, ' + opacity + ')';
+
+            } else {
+
+                browserCanvasContext.fillStyle = 'rgba(255, 233, 31, ' + opacity + ')';  /* highlight the current record */
 
             }
 
             browserCanvasContext.arc(point.x, point.y, radius3, 0, Math.PI * 2, true);
 
-            //browserCanvasContext.closePath();
-            //browserCanvasContext.beginPath();
+            browserCanvasContext.closePath();
+            browserCanvasContext.fill();
+
+            /* Middle Circle */
+
+            browserCanvasContext.beginPath();
+
+            browserCanvasContext.strokeStyle = 'rgba(44, 61, 89, ' + opacity + ')';
 
             if (isCurrentRecord === false) {
 
-                browserCanvasContext.strokeStyle = 'rgba(105, 27, 7, 1)';
-                browserCanvasContext.fillStyle = 'rgba(217, 64, 26, 1)';
+                browserCanvasContext.fillStyle = 'rgba(50, 108, 201, ' + opacity + ')';
+
+            } else {
+
+                browserCanvasContext.fillStyle = 'rgba(255, 233, 31, ' + opacity + ')';  /* highlight the current record */
 
             }
 
             browserCanvasContext.arc(point.x, point.y, radius2, 0, Math.PI * 2, true);
 
-            //browserCanvasContext.closePath();
-            //browserCanvasContext.beginPath();
+            browserCanvasContext.closePath();
+            browserCanvasContext.fill();
+
+            /* Inner Circle */
+
+            browserCanvasContext.beginPath();
+
+            browserCanvasContext.strokeStyle = 'rgba(27, 7, 105, ' + opacity + ')';
 
             if (isCurrentRecord === false) {
 
-                browserCanvasContext.strokeStyle = 'rgba(27, 7, 105, 1)';
-                browserCanvasContext.fillStyle = 'rgba(64, 26, 217, 1)';
+                browserCanvasContext.fillStyle = 'rgba(64, 26, 217, ' + opacity + ')';
+
+            } else {
+
+                browserCanvasContext.fillStyle = 'rgba(255, 233, 31, ' + opacity + ')';  /* highlight the current record */
 
             }
 
             browserCanvasContext.arc(point.x, point.y, radius1, 0, Math.PI * 2, true);
 
             browserCanvasContext.closePath();
+            browserCanvasContext.fill();
+
 
             if (
                 point.x < viewPort.visibleArea.topLeft.x + 50
diff --git a/obj/Debug/AAMariam-Plotter.njsproj.CoreCompileInputs.cache b/obj/Debug/AAMariam-Plotter.njsproj.CoreCompileInputs.cache
new file mode 100644
index 000000000..43ce23bd9
--- /dev/null
+++ b/obj/Debug/AAMariam-Plotter.njsproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+a4fca7697da12adc1a74c13ff1ccc52af419c79d
diff --git a/obj/Debug/AAMariam-Plotter.njsproj.FileListAbsolute.txt b/obj/Debug/AAMariam-Plotter.njsproj.FileListAbsolute.txt
new file mode 100644
index 000000000..f4231dbb4
--- /dev/null
+++ b/obj/Debug/AAMariam-Plotter.njsproj.FileListAbsolute.txt
@@ -0,0 +1,3 @@
+C:\Users\Luis\source\repos\AAMariam-Plotter\obj\Debug\AAMariam-Plotter.njsprojResolveAssemblyReference.cache
+C:\Users\Luis\source\repos\AAMariam-Plotter\obj\Debug\AAMariam-Plotter.njsproj.CoreCompileInputs.cache
+C:\Users\Luis\source\repos\AAMariam-Plotter\bin\Microsoft.NodejsTools.WebRole.dll
diff --git a/obj/Debug/AAMariam-Plotter.njsprojResolveAssemblyReference.cache b/obj/Debug/AAMariam-Plotter.njsprojResolveAssemblyReference.cache
new file mode 100644
index 000000000..67d5be9b7
Binary files /dev/null and b/obj/Debug/AAMariam-Plotter.njsprojResolveAssemblyReference.cache differ