diff --git a/Code/ESP32_communication/Two-way/ESP32_master/ESP32_master.ino b/Code/ESP32_communication/Two-way/ESP32_master/ESP32_master.ino
index 43a4944ba8d255f6952e31aabcdb7009a3882680..60b27146047d928237c71c6936811d15cf332f40 100644
--- a/Code/ESP32_communication/Two-way/ESP32_master/ESP32_master.ino
+++ b/Code/ESP32_communication/Two-way/ESP32_master/ESP32_master.ino
@@ -1,143 +1,144 @@
-#include <esp_now.h>
-#include <WiFi.h>
-#include <Wire.h>
-
-// REPLACE WITH THE MAC Address of your receiver 
-uint8_t broadcastAddress[] = {0xC4, 0xDD, 0x57, 0x9E, 0x91, 0x74};
-String success;
-// Define variables to store BME280 readings to be sent
-String strdata = "";
-String valdata = "";
-String quedata = "";
-int count = 0;
-
-// Define variables to store incoming readings
-String incomingStr = "";
-double incomingVal = 0;
-String incomingDebug = "";
-
-// =====================================================================================
-//Structure the sending data
-//Must match the receiver structure
-typedef struct struct_message {
-  String StrD;
-  double ValD;
-  String DebugM;
-  String QueM;
-  String VarM;
-} struct_message;
-
-// Create a struct_message to hold incoming sensor readings
-// struct_message incomingReadings;
-struct_message sentData;
-// Callback when data is sent
-void OnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status) {
-  Serial.print("\r\nLast Packet Send Status:\t");
-  Serial.println(status == ESP_NOW_SEND_SUCCESS ? "Delivery Success" : "Delivery Fail");
-  if (status ==0){
-    success = "Delivery Success :)";
-  }
-  else{
-    success = "Delivery Fail :(";
-  }
-}
-
-// Callback when data is received
-void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
-  memcpy(&sentData, incomingData, sizeof(sentData));
-  // Serial.print("Bytes received: ");
-  // Serial.println(len);
-  // incomingDebug = incomingReadings.DebugM;
-  Serial.print("Var message:");
-  Serial.println(sentData.VarM);
-  Serial.print("Debug message:");
-  Serial.println(sentData.DebugM);
-}
-// =====================================================================================
-
-void setup() {
-  // Init Serial Monitor
-  Serial.begin(9600);
- 
-  // Set device as a Wi-Fi Station
-  WiFi.mode(WIFI_STA);
-
-  // Init ESP-NOW
-  if (esp_now_init() != ESP_OK) {
-    Serial.println("Error initializing ESP-NOW");
-    return;
-  }
-
-  // Once ESPNow is successfully Init, we will register for Send CB to
-  // get the status of Trasnmitted packet
-  esp_now_register_send_cb(OnDataSent);
-  
-  // Register peer
-  esp_now_peer_info_t peerInfo;
-  memcpy(peerInfo.peer_addr, broadcastAddress, 6);
-  peerInfo.channel = 0;  
-  peerInfo.encrypt = false;
-  
-  // Add peer        
-  if (esp_now_add_peer(&peerInfo) != ESP_OK){
-    Serial.println("Failed to add peer");
-    return;
-  }
-  // Register for a callback function that will be called when data is received
-  esp_now_register_recv_cb(OnDataRecv);
-}
-
-// =====================================================================================
-void loop()
-{ 
-  while (Serial.available()>0){
-   int inChar = Serial.read();
-   strdata += char(inChar);
-   delay(10);
-   count +=1;
-   if (count == 3){ 
-    sentData.StrD = strdata;
-    Serial.println(sentData.StrD);
-   }
-  if (isDigit(inChar) || inChar == '.' || inChar == '-'){
-    valdata += char(inChar);
-   }
-  if (inChar == '?'){
-    quedata += char(inChar);
-    sentData.QueM = quedata;
-  }
-  if (inChar == '\n'){ //after message is sent
-    Serial.print("quedata:");
-    Serial.println(quedata);
-
-    if (quedata!= "?"){
-   sentData.ValD = valdata.toDouble();
-   Serial.print("ValD");
-   Serial.println(sentData.ValD);
-   valdata = "";
-   sentData.QueM = "";
-    }else{
-      // sentData.ValD = 0;
-         Serial.print("ValD");
-   Serial.println(sentData.ValD);
-      Serial.print("QueM:");
-      Serial.println(sentData.QueM);
-    }
-
-  esp_err_t result = esp_now_send(broadcastAddress, (uint8_t *) &sentData, sizeof(sentData));
-  // esp_now_send(RxMACaddress, (uint8_t *) &sentData, sizeof(sentData));
-  //-------------------------------------------------------------------------------------
-  if (result == ESP_OK) Serial.println("Sent with success");
-  else Serial.println("Error sending the data");
-  //-------------------------------------------------------------------------------------
-  delay(500);
-  strdata = "";
-  quedata = "";
-  count = 0;
-  }
-  
-  }
-
-  //-------------------------------------------------------------------------------------
-  
-}
+#include <esp_now.h>
+#include <WiFi.h>
+#include <Wire.h>
+
+// REPLACE WITH THE MAC Address of your receiver (SLAVE)
+uint8_t broadcastAddress[] = {0x40, 0xF5, 0x20, 0x44, 0xB6, 0x4C};
+
+String success;
+// Define variables to store BME280 readings to be sent
+String strdata = "";
+String valdata = "";
+String quedata = "";
+int count = 0;
+
+// Define variables to store incoming readings
+String incomingStr = "";
+double incomingVal = 0;
+String incomingDebug = "";
+
+// =====================================================================================
+//Structure the sending data
+//Must match the receiver structure
+typedef struct struct_message {
+  String StrD;
+  double ValD;
+  String DebugM;
+  String QueM;
+  String VarM;
+} struct_message;
+
+// Create a struct_message to hold incoming sensor readings
+// struct_message incomingReadings;
+struct_message sentData;
+// Callback when data is sent
+void OnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status) {
+  Serial.print("\r\nLast Packet Send Status:\t");
+  Serial.println(status == ESP_NOW_SEND_SUCCESS ? "Delivery Success" : "Delivery Fail");
+  if (status ==0){
+    success = "Delivery Success :)";
+  }
+  else{
+    success = "Delivery Fail :(";
+  }
+}
+
+// Callback when data is received
+void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
+  memcpy(&sentData, incomingData, sizeof(sentData));
+  // Serial.print("Bytes received: ");
+  // Serial.println(len);
+  // incomingDebug = incomingReadings.DebugM;
+  Serial.print("Var message:");
+  Serial.println(sentData.VarM);
+  Serial.print("Debug message:");
+  Serial.println(sentData.DebugM);
+}
+// =====================================================================================
+
+void setup() {
+  // Init Serial Monitor
+  Serial.begin(115200);
+ 
+  // Set device as a Wi-Fi Station
+  WiFi.mode(WIFI_STA);
+
+  // Init ESP-NOW
+  if (esp_now_init() != ESP_OK) {
+    Serial.println("Error initializing ESP-NOW");
+    return;
+  }
+
+  // Once ESPNow is successfully Init, we will register for Send CB to
+  // get the status of Trasnmitted packet
+  esp_now_register_send_cb(OnDataSent);
+  
+  // Register peer
+  esp_now_peer_info_t peerInfo;
+  memcpy(peerInfo.peer_addr, broadcastAddress, 6);
+  peerInfo.channel = 0;  
+  peerInfo.encrypt = false;
+  
+  // Add peer        
+  if (esp_now_add_peer(&peerInfo) != ESP_OK){
+    Serial.println("Failed to add peer");
+    return;
+  }
+  // Register for a callback function that will be called when data is received
+  esp_now_register_recv_cb(OnDataRecv);
+}
+
+// =====================================================================================
+void loop()
+{ 
+  while (Serial.available()>0){
+   int inChar = Serial.read();
+   strdata += char(inChar);
+   delay(10);
+   count +=1;
+   if (count == 3){ 
+    sentData.StrD = strdata;
+    Serial.println(sentData.StrD);
+   }
+  if (isDigit(inChar) || inChar == '.' || inChar == '-'){
+    valdata += char(inChar);
+   }
+  if (inChar == '?'){
+    quedata += char(inChar);
+    sentData.QueM = quedata;
+  }
+  if (inChar == '\n'){ //after message is sent
+    Serial.print("quedata:");
+    Serial.println(quedata);
+
+    if (quedata!= "?"){
+   sentData.ValD = valdata.toDouble();
+   Serial.print("ValD");
+   Serial.println(sentData.ValD);
+   valdata = "";
+   sentData.QueM = "";
+    }else{
+      // sentData.ValD = 0;
+         Serial.print("ValD");
+   Serial.println(sentData.ValD);
+      Serial.print("QueM:");
+      Serial.println(sentData.QueM);
+    }
+
+  esp_err_t result = esp_now_send(broadcastAddress, (uint8_t *) &sentData, sizeof(sentData));
+  // esp_now_send(RxMACaddress, (uint8_t *) &sentData, sizeof(sentData));
+  //-------------------------------------------------------------------------------------
+  if (result == ESP_OK) Serial.println("Sent with success");
+  else Serial.println("Error sending the data");
+  //-------------------------------------------------------------------------------------
+  delay(100);
+  strdata = "";
+  quedata = "";
+  count = 0;
+  }
+  
+  }
+
+  //-------------------------------------------------------------------------------------
+  
+}