diff --git a/examples/BlynkClient/BlynkClient.ino b/examples/BlynkClient/BlynkClient.ino
index 9de5419..9672edc 100644
--- a/examples/BlynkClient/BlynkClient.ino
+++ b/examples/BlynkClient/BlynkClient.ino
@@ -30,9 +30,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_A6
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 #include <TinyGsmClient.h>
 #include <BlynkSimpleSIM800.h>
@@ -81,4 +84,3 @@ void loop()
 {
   Blynk.run();
 }
-
diff --git a/examples/FileDownload/FileDownload.ino b/examples/FileDownload/FileDownload.ino
index 781047a..8fbe75c 100644
--- a/examples/FileDownload/FileDownload.ino
+++ b/examples/FileDownload/FileDownload.ino
@@ -14,9 +14,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_A6
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 // Increase RX buffer
 #define TINY_GSM_RX_BUFFER 1030
@@ -126,7 +129,7 @@ void loop() {
     //Serial.println(line);    // Uncomment this to show response header
     line.toLowerCase();
     if (line.startsWith("content-length:")) {
-      contentLength = line.substring(line.lastIndexOf(':') + 1).toInt();  
+      contentLength = line.substring(line.lastIndexOf(':') + 1).toInt();
     } else if (line.length() == 0) {
       break;
     }
@@ -175,4 +178,3 @@ void loop() {
     delay(1000);
   }
 }
-
diff --git a/examples/MqttClient/MqttClient.ino b/examples/MqttClient/MqttClient.ino
index 6fe5676..a44f5a1 100644
--- a/examples/MqttClient/MqttClient.ino
+++ b/examples/MqttClient/MqttClient.ino
@@ -27,9 +27,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_A6
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 #include <TinyGsmClient.h>
 #include <PubSubClient.h>
@@ -145,4 +148,3 @@ void mqttCallback(char* topic, byte* payload, unsigned int len) {
     mqtt.publish(topicLedStatus, ledStatus ? "1" : "0");
   }
 }
-
diff --git a/examples/WebClient/WebClient.ino b/examples/WebClient/WebClient.ino
index 0e58bfa..87f0bed 100644
--- a/examples/WebClient/WebClient.ino
+++ b/examples/WebClient/WebClient.ino
@@ -10,9 +10,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_A6
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 #include <TinyGsmClient.h>
 
@@ -109,4 +112,3 @@ void loop() {
     delay(1000);
   }
 }
-
diff --git a/tools/AT_Debug/AT_Debug.ino b/tools/AT_Debug/AT_Debug.ino
index 26db144..f13976b 100644
--- a/tools/AT_Debug/AT_Debug.ino
+++ b/tools/AT_Debug/AT_Debug.ino
@@ -10,8 +10,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 #include <TinyGsmClient.h>
 
@@ -86,4 +90,3 @@ void loop() {
     delay(0);
   }
 }
-
diff --git a/tools/Diagnostics/Diagnostics.ino b/tools/Diagnostics/Diagnostics.ino
index 41d804d..8a05dbd 100644
--- a/tools/Diagnostics/Diagnostics.ino
+++ b/tools/Diagnostics/Diagnostics.ino
@@ -11,9 +11,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_A6
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 // Increase buffer fo see less commands
 #define TINY_GSM_RX_BUFFER 256
@@ -151,4 +154,3 @@ void loop() {
     delay(1000);
   }
 }
-
diff --git a/tools/FactoryReset/FactoryReset.ino b/tools/FactoryReset/FactoryReset.ino
index 72d258f..8996b81 100644
--- a/tools/FactoryReset/FactoryReset.ino
+++ b/tools/FactoryReset/FactoryReset.ino
@@ -11,8 +11,12 @@
 
 // Select your modem:
 #define TINY_GSM_MODEM_SIM800
-//#define TINY_GSM_MODEM_SIM900
-//#define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_SIM900
+// #define TINY_GSM_MODEM_A6
+// #define TINY_GSM_MODEM_A7
+// #define TINY_GSM_MODEM_M590
+// #define TINY_GSM_MODEM_ESP8266
+// #define TINY_GSM_MODEM_XBEE 
 
 #include <TinyGsmClient.h>
 #include <StreamDebugger.h>