diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 698898f..dc0ff23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -112,7 +109,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="676">
-              <caret line="93" column="0" lean-forward="true" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
+              <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -122,7 +119,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="175">
-              <caret line="407" column="38" lean-forward="true" selection-start-line="407" selection-start-column="38" selection-end-line="407" selection-end-column="38" />
+              <caret line="407" column="38" lean-forward="false" selection-start-line="407" selection-start-column="38" selection-end-line="407" selection-end-column="38" />
               <folding />
             </state>
           </provider>
@@ -162,7 +159,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="374">
-              <caret line="361" column="54" lean-forward="true" selection-start-line="361" selection-start-column="54" selection-end-line="361" selection-end-column="54" />
+              <caret line="361" column="54" lean-forward="false" selection-start-line="361" selection-start-column="54" selection-end-line="361" selection-end-column="54" />
               <folding />
             </state>
           </provider>
@@ -203,8 +200,8 @@
       <file leaf-file-name="Database.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2085">
-              <caret line="141" column="52" lean-forward="false" selection-start-line="141" selection-start-column="52" selection-end-line="141" selection-end-column="52" />
+            <state relative-caret-position="542">
+              <caret line="153" column="68" lean-forward="true" selection-start-line="153" selection-start-column="68" selection-end-line="153" selection-end-column="68" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -216,7 +213,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="552">
-              <caret line="64" column="69" lean-forward="true" selection-start-line="64" selection-start-column="69" selection-end-line="64" selection-end-column="69" />
+              <caret line="64" column="69" lean-forward="false" selection-start-line="64" selection-start-column="69" selection-end-line="64" selection-end-column="69" />
               <folding>
                 <element signature="e#3896#3897#0" expanded="true" />
                 <element signature="e#3928#3929#0" expanded="true" />
@@ -750,8 +747,8 @@
         <option value="$PROJECT_DIR$/startup.sh" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
       </list>
     </option>
   </component>
@@ -1566,7 +1563,7 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
-          <caret line="361" column="54" lean-forward="true" selection-start-line="361" selection-start-column="54" selection-end-line="361" selection-end-column="54" />
+          <caret line="361" column="54" lean-forward="false" selection-start-line="361" selection-start-column="54" selection-end-line="361" selection-end-column="54" />
           <folding />
         </state>
       </provider>
@@ -1574,7 +1571,7 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="676">
-          <caret line="93" column="0" lean-forward="true" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
+          <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1582,7 +1579,7 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="552">
-          <caret line="64" column="69" lean-forward="true" selection-start-line="64" selection-start-column="69" selection-end-line="64" selection-end-column="69" />
+          <caret line="64" column="69" lean-forward="false" selection-start-line="64" selection-start-column="69" selection-end-line="64" selection-end-column="69" />
           <folding>
             <element signature="e#3896#3897#0" expanded="true" />
             <element signature="e#3928#3929#0" expanded="true" />
@@ -1611,15 +1608,15 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="175">
-          <caret line="407" column="38" lean-forward="true" selection-start-line="407" selection-start-column="38" selection-end-line="407" selection-end-column="38" />
+          <caret line="407" column="38" lean-forward="false" selection-start-line="407" selection-start-column="38" selection-end-line="407" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2085">
-          <caret line="141" column="52" lean-forward="false" selection-start-line="141" selection-start-column="52" selection-end-line="141" selection-end-column="52" />
+        <state relative-caret-position="542">
+          <caret line="153" column="68" lean-forward="true" selection-start-line="153" selection-start-column="68" selection-end-line="153" selection-end-column="68" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/src/main/java/com/henrypump/poc/Database.java b/src/main/java/com/henrypump/poc/Database.java
index 1e63d9c..66f5c3d 100644
--- a/src/main/java/com/henrypump/poc/Database.java
+++ b/src/main/java/com/henrypump/poc/Database.java
@@ -17,6 +17,7 @@ import org.bson.Document;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
 import com.mongodb.client.MongoCursor;
@@ -139,10 +140,11 @@ public class Database {
 
 
     public long newMeasurement(Measurement inpMeasurement){
-        ZonedDateTime nowDate = ZonedDateTime.now();
-        ZonedDateTime todayDate = ZonedDateTime.of(nowDate.getYear(), nowDate.getMonthValue(), nowDate.getDayOfMonth(), 0, 0, 0, 0, nowDate.getZone());
+        ZonedDateTime nowDate = ZonedDateTime.now(ZoneId.of("UTC"));
+        ZonedDateTime todayDate = ZonedDateTime.of(nowDate.getYear(), nowDate.getMonthValue(), nowDate.getDayOfMonth(), 0, 0, 0, 0, ZoneId.of("UTC"));
         Date storeDate = Date.from(todayDate.toInstant());
         Document nowMeasurement = new Document("values." + nowDate.getHour() + "." + nowDate.getMinute(), inpMeasurement.getCurrentValue())
+                .append("currentValue", inpMeasurement.getCurrentValue())
                 .append("maxValue", inpMeasurement.getDailyMax())
                 .append("minValue", inpMeasurement.getDailyMin())
                 .append("averageValue", inpMeasurement.getAverage())