diff --git a/mini-beieli-node.ino b/mini-beieli-node.ino
index 330fb52..e3b58ea 100644
--- a/mini-beieli-node.ino
+++ b/mini-beieli-node.ino
@@ -156,7 +156,7 @@ void setup(void)
 
   setup_platform();
   SetupScales(config_data.debug_level);
-  ClearLoraData();
+  ClearLoraData(true);
   setup_bme280();
 
   setup_flash();
@@ -382,7 +382,7 @@ void loop()
   }
 }
 
-void ClearLoraData(void)
+void ClearLoraData(bool clearLastValues)
 {
   lora_data.version = LORA_DATA_VERSION;
   lora_data.vbat = 0;
@@ -412,13 +412,15 @@ void ClearLoraData(void)
   my_position = 0;
 
   // We initialize last_sensor_reading
-  last_sensor_reading.vbat = 0;
-  last_sensor_reading.weight1 = 0;
-  last_sensor_reading.weight2 = 0;
-  last_sensor_reading.weight = 0;
-  last_sensor_reading.temperature = 0;
-  last_sensor_reading.humidity = 0;
-  last_sensor_reading.pressure = 0;
+  if (clearLastValues) {
+    last_sensor_reading.vbat = 0;
+    last_sensor_reading.weight1 = 0;
+    last_sensor_reading.weight2 = 0;
+    last_sensor_reading.weight = 0;
+    last_sensor_reading.temperature = 0;
+    last_sensor_reading.humidity = 0;
+    last_sensor_reading.pressure = 0;
+  }
 }
 
 void ShowLORAData(bool firstTime)
@@ -504,7 +506,7 @@ uint8_t GetVBatValue(int millivolts)
 void DoDeepSleep(uint32_t sleep_time)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep, millis: %d\n",millis());
+    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep, millis: %d\n", millis());
   }
 
   // Prepare Deep Sleep
@@ -521,7 +523,7 @@ void DoDeepSleep(uint32_t sleep_time)
   deepSleepRecovery();
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("done with deep sleep, millis: %d\n",millis());
+    gCatena.SafePrintf("done with deep sleep, millis: %d\n", millis());
   }
 }
 
@@ -769,7 +771,7 @@ void StartNewIteration() {
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("LMIC.opmode just before Sleeping: %#x\n", LMIC.opmode);
     gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
-    gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
+    gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
   }
 
   if (!fUsbPower && !stop_iterations)  {
@@ -820,7 +822,7 @@ void startSendingUplink(bool firstTime, bool confirmed)
   if (confirmed) {
     fConfirmed = true;
   }
-  
+
   if (firstTime) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("SendBuffer firstTime\n");
@@ -830,19 +832,19 @@ void startSendingUplink(bool firstTime, bool confirmed)
       if (config_data.debug_level > 0) {
         gCatena.SafePrintf("LMIC.opmode just after SendBuffer (successful): %#x\n", LMIC.opmode);
         gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
-        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
+        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
       }
     }
     else {
       gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
       gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
-      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
     }
   } else {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("LMIC.opmode just before SendBuffer: %#x\n", LMIC.opmode);
       gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
-      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
       gCatena.SafePrintf("SendBuffer not firstTime\n");
     }
     if (gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort)) {
@@ -850,16 +852,16 @@ void startSendingUplink(bool firstTime, bool confirmed)
       if (config_data.debug_level > 0) {
         gCatena.SafePrintf("LMIC.opmode just after SendBuffer (successful): %#x\n", LMIC.opmode);
         gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
-        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
+        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
       }
     } else {
       gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
       gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
-      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
     }
   }
 
-  ClearLoraData();
+  ClearLoraData(false);
 }
 
 static void sendBufferDoneCb(
@@ -1191,7 +1193,7 @@ cCommandStream::CommandStatus cmdCalibrateScales(cCommandStream * pThis, void *p
   String s_cal_w1_factor(argv[2]);
   String s_cal_w2_0(argv[3]);
   String s_cal_w2_factor(argv[4]);
-  
+
   config_data.cal_w1_0 = s_cal_w1_0.toInt();
   config_data.cal_w1_factor = s_cal_w1_factor.toFloat();
   config_data.cal_w2_0 = s_cal_w2_0.toInt();