diff --git a/main.ino b/main.ino
index 79e0e9b..7ae4a1f 100644
--- a/main.ino
+++ b/main.ino
@@ -21,72 +21,68 @@ Adafruit_ST7735 tft = Adafruit_ST7735(TFT_CS, TFT_DC, TFT_RST); // Set HW SPI pi
 const int buttonPin = 16;
 
 const int AMOUNT_DATAPOINTS = 75; // ~120 max on Arduino Nano (2kB SRAM)
-const float WAIT_TIME = 150;
+const float WAIT_TIME = 0.1;
 
 class DataStorage {
 private:
   float data[AMOUNT_DATAPOINTS];
-  int cursor;
+  int rIndex;
+  int rCount;
   const int MAX_DATA_POINTS;
   const String UNIT;
 
 public:
   DataStorage(String unit, int maxDataPoints)
-    : UNIT(unit), MAX_DATA_POINTS(maxDataPoints), cursor(0) {
+    : UNIT(unit), MAX_DATA_POINTS(maxDataPoints), rIndex(0), rCount(0) {
     for (int i = 0; i < MAX_DATA_POINTS; i++) {
-      this->data[i] = 0;
-    };
-  };
-
-
-  float getDataByIndex(int index) {
-    if(index < 0 || index >= this->cursor) return 0;
-    return this->data[index];
-  };
-
-  int getCursor() const {return this->cursor;};
+      data[i] = 0;
+    }
+  }
 
   void addData(float newData) {
-    if (this->cursor < this->MAX_DATA_POINTS) {
-      this->data[this->cursor++] = newData; //++cursor, cursor++, know the difference :3
-    } else {
-      for (int i = 0; i < this->MAX_DATA_POINTS - 1; i++) {
-        this->data[i] = this->data[i + 1];
-      }
-      this->data[this->MAX_DATA_POINTS - 1] = newData;
-    }
-  };
+    data[rIndex] = newData;
+    rIndex = (rIndex + 1) % MAX_DATA_POINTS;
+    if (rCount < MAX_DATA_POINTS) rCount++;
+  }
+
+  float getDataByIndex(int index) {
+    if(index < 0 || index >= rCount) return 0;
+    int idx = (rIndex + MAX_DATA_POINTS - rCount + index) % MAX_DATA_POINTS;
+    return data[idx];
+  }
+
+  int getCursor() const { return rCount; }
 
   float getMaxDataPoint() {
-    if (this->cursor == 0) return 0;
-    float maxY = this->data[0];
-    for (int i = 1; i < this->cursor; i++) {
-      if (this->data[i] > maxY) maxY = this->data[i];
+    if (rCount == 0) return 0;
+    float maxY = getDataByIndex(0);
+    for (int i = 1; i < rCount; i++) {
+      float v = getDataByIndex(i);
+      if (v > maxY) maxY = v;
     }
     return maxY;
-  };
+  }
 
   float getMinDataPoint() {
-    if (this->cursor == 0) return 0;
-    float minY = this->data[0];
-    for (int i = 1; i < this->cursor; i++) {
-      if (this->data[i] < minY) minY = this->data[i];
+    if (rCount == 0) return 0;
+    float minY = getDataByIndex(0);
+    for (int i = 1; i < rCount; i++) {
+      float v = getDataByIndex(i);
+      if (v < minY) minY = v;
     }
     return minY;
-  };
+  }
 
   float getAvgDataPoint() {
-    if (this->cursor == 0) return 0;
-    float avgY = this->data[0];
-    for (int i = 1; i < this->cursor; i++) {
-      avgY += data[i];
-    };
-    return avgY / this->cursor;
-  };
+    if (rCount == 0) return 0;
+    float sum = 0;
+    for (int i = 0; i < rCount; i++) {
+      sum += getDataByIndex(i);
+    }
+    return sum / rCount;
+  }
 
-  String getUnit() {
-    return this->UNIT;
-  };
+  String getUnit() { return UNIT; }
 };
 
 class Element {