diff --git a/src/app/release/app-release.apk b/src/app/release/app-release.apk
index 2af74d0..180ffaf 100644
Binary files a/src/app/release/app-release.apk and b/src/app/release/app-release.apk differ
diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml
index 555e770..45bc7a3 100644
--- a/src/app/src/main/AndroidManifest.xml
+++ b/src/app/src/main/AndroidManifest.xml
@@ -20,10 +20,12 @@
         android:theme="@style/Theme.LocateMyDevice"
         tools:targetApi="31">
 
+        <!-- https://developer.android.com/guide/topics/manifest/receiver-element -->
         <receiver
             android:name=".SmsReceiver"
             android:enabled="true"
             android:exported="true"
+            android:directBootAware="true"
             android:permission="android.permission.BROADCAST_SMS">
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
diff --git a/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java b/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java
index 9bf3d16..2355cc4 100644
--- a/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java
+++ b/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java
@@ -9,12 +9,20 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.telephony.CellInfo;
+import android.telephony.CellInfoCdma;
+import android.telephony.CellInfoGsm;
+import android.telephony.CellInfoLte;
+import android.telephony.CellInfoWcdma;
 import android.telephony.SmsManager;
+import android.telephony.TelephonyManager;
+import android.telephony.gsm.GsmCellLocation;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
 
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -22,11 +30,9 @@ import java.util.regex.Pattern;
 public class SmsHandler {
     /*
      * Messages:
-     * finddevice 1234 locate
      * [command] [password] [option]
      *
      */
-    @RequiresApi(api = Build.VERSION_CODES.R)
     public void handleSms(String message, String sender, Context context) {
         Settings settings = new Settings(context);
         String password = settings.get(Settings.PASSWORD);
@@ -39,7 +45,7 @@ public class SmsHandler {
                 + "\\s"
                 + "[^\\s]*"
                 + "\\s"
-                + Utils.LOCATE_OPTION;
+                + Utils.LOCATE_OPTION + "|" + Utils.CELLULAR_INFO_OPTION;
         Pattern pattern = Pattern.compile(regexToMatch);
         Matcher matcher = pattern.matcher(message);
         if (!matcher.find()) {
@@ -101,11 +107,56 @@ public class SmsHandler {
                 }, null);
             }
         }
+
+        // cellinfo
+        else if(providedOption.equals(Utils.CELLULAR_INFO_OPTION)) {
+
+            TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+            StringBuilder resultSms = new StringBuilder();
+
+            resultSms.append("Towers in range:");
+            List<CellInfo> availableTowersInRange = telephony.getAllCellInfo();
+            for(CellInfo tower : availableTowersInRange){
+                resultSms.append("\n\n");
+                if(tower.isRegistered()){
+                    resultSms.append("[Connected to this tower]\n");
+                }
+                if (tower instanceof CellInfoWcdma) {
+                    resultSms.append("Radio Type: WCDMA\n");
+                    resultSms.append("CID: ").append(((CellInfoWcdma) tower).getCellIdentity().getCid()).append("\n");
+                    resultSms.append("LAC: ").append(((CellInfoWcdma) tower).getCellIdentity().getLac()).append("\n");
+                    resultSms.append("MCC: ").append(((CellInfoWcdma) tower).getCellIdentity().getMccString()).append("\n");
+                    resultSms.append("MNC: ").append(((CellInfoWcdma) tower).getCellIdentity().getMncString()).append("\n");
+                }
+                else if (tower instanceof CellInfoGsm) {
+                    resultSms.append("Radio Type: GSM\n");
+                    resultSms.append("CID: ").append(((CellInfoGsm) tower).getCellIdentity().getCid()).append("\n");
+                    resultSms.append("LAC: ").append(((CellInfoGsm) tower).getCellIdentity().getLac()).append("\n");
+                    resultSms.append("MCC: ").append(((CellInfoGsm) tower).getCellIdentity().getMccString()).append("\n");
+                    resultSms.append("MNC: ").append(((CellInfoGsm) tower).getCellIdentity().getMncString()).append("\n");
+                }
+                else if (tower instanceof CellInfoLte) {
+                    resultSms.append("Radio Type: LTE\n");
+                    resultSms.append("CI: ").append(((CellInfoLte) tower).getCellIdentity().getCi()).append("\n");
+                    resultSms.append("TAC: ").append(((CellInfoLte) tower).getCellIdentity().getTac()).append("\n");
+                    resultSms.append("MCC: ").append(((CellInfoLte) tower).getCellIdentity().getMccString()).append("\n");
+                    resultSms.append("MNC: ").append(((CellInfoLte) tower).getCellIdentity().getMncString()).append("\n");
+                }
+                else if (tower instanceof CellInfoCdma) {
+                    resultSms.append("Radio Type: CDMA\n");
+                    resultSms.append("Latitude: ").append(((CellInfoCdma) tower).getCellIdentity().getLatitude()).append("\n");
+                    resultSms.append("Longitude: ").append(((CellInfoCdma) tower).getCellIdentity().getLongitude()).append("\n");
+                    resultSms.append("Network ID: ").append(((CellInfoCdma) tower).getCellIdentity().getNetworkId()).append("\n");
+                    resultSms.append("System ID: ").append(((CellInfoCdma) tower).getCellIdentity().getSystemId()).append("\n");
+                }
+            }
+            smsManager.sendTextMessage(sender, null, resultSms.toString(),null, null);
+        }
     }
 
     private void sendGpsCoordinates(SmsManager smsManager, String sendTo, double latitude, double longitude){
         smsManager.sendTextMessage(sendTo, null,
-                "GPS coordinates are:" +
+                "Coordinates are:" +
                         "\nLatitude: " + latitude +
                         "\nLongitude: " + longitude + "\n" +
                         Utils.buildOSMLink(latitude, longitude), null, null);
diff --git a/src/app/src/main/java/com/xfarrow/locatemydevice/SmsReceiver.java b/src/app/src/main/java/com/xfarrow/locatemydevice/SmsReceiver.java
index b67236e..a4674bf 100644
--- a/src/app/src/main/java/com/xfarrow/locatemydevice/SmsReceiver.java
+++ b/src/app/src/main/java/com/xfarrow/locatemydevice/SmsReceiver.java
@@ -10,7 +10,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 public class SmsReceiver extends BroadcastReceiver {
-
+    // https://www.vogella.com/tutorials/AndroidBroadcastReceiver/article.html
     // This method gets fired as soon as it receives an SMS
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -33,7 +33,7 @@ public class SmsReceiver extends BroadcastReceiver {
                 }
                 // getOriginatingAddress() will always be the same in messages[X] for 0<=X<messages.length
                 String sender = messages[0].getOriginatingAddress();
-                String message = sb.toString();
+                String message = sb.toString().trim();
 
                 // prevent any other broadcast receivers from receiving broadcast
                 abortBroadcast();
diff --git a/src/app/src/main/java/com/xfarrow/locatemydevice/Utils.java b/src/app/src/main/java/com/xfarrow/locatemydevice/Utils.java
index 35e7535..2f188ef 100644
--- a/src/app/src/main/java/com/xfarrow/locatemydevice/Utils.java
+++ b/src/app/src/main/java/com/xfarrow/locatemydevice/Utils.java
@@ -8,6 +8,7 @@ public class Utils {
 
 
     public static final String LOCATE_OPTION = "locate";
+    public static final String CELLULAR_INFO_OPTION = "cellinfo";
 
     public static String buildOSMLink(double latitude, double longitude){
         return "https://www.openstreetmap.org/?mlat=" + latitude + "&mlon=" + longitude;
diff --git a/src/app/src/main/res/layout/settings.xml b/src/app/src/main/res/layout/settings.xml
index 51d0357..6b4d2d8 100644
--- a/src/app/src/main/res/layout/settings.xml
+++ b/src/app/src/main/res/layout/settings.xml
@@ -34,6 +34,8 @@
                 android:id="@+id/buttonEnterPassword"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="Enter Password"/>
 
             <View
@@ -63,6 +65,7 @@
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="LMD" />
         </LinearLayout>
     </ScrollView>