diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad47570..1350191 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <!-- other commands -->
     <uses-permission
diff --git a/app/src/main/java/fr/themsou/monitorinternetless/commander/CommandExecutor.java b/app/src/main/java/fr/themsou/monitorinternetless/commander/CommandExecutor.java
index 293a776..d7f43d0 100644
--- a/app/src/main/java/fr/themsou/monitorinternetless/commander/CommandExecutor.java
+++ b/app/src/main/java/fr/themsou/monitorinternetless/commander/CommandExecutor.java
@@ -20,7 +20,7 @@ public class CommandExecutor {
 
     private final String[] args;
     private final Context context;
-    private final String fromNumber;
+    public final String fromNumber;
     public CommandExecutor(String[] args, Context context, String fromNumber){
         this.args = args;
         this.context = context;
@@ -55,16 +55,16 @@ public String executeAuto() {
                 break;
             }
         }
-        if(terminatedMessage == null) return "No terminated message, a fail probably occurred";
+        if(terminatedMessage == null) return "No terminated message";
         else return terminatedMessage;
     }
 
 
     public void replyAndTerminate(String message){
-        reply(message);
+        reply(fromNumber, message);
         terminate("From replyAndTerminate() \"" + message + "\"");
     }
-    public void reply(String message){
+    public static void reply(String fromNumber, String message){
         SmsManager smsManager = SmsManager.getDefault();
         smsManager.sendMultipartTextMessage(fromNumber, null, smsManager.divideMessage(message), null, null);
     }
diff --git a/app/src/main/java/fr/themsou/monitorinternetless/commander/LocateCommandExecutor.java b/app/src/main/java/fr/themsou/monitorinternetless/commander/LocateCommandExecutor.java
index f7186ac..9342119 100644
--- a/app/src/main/java/fr/themsou/monitorinternetless/commander/LocateCommandExecutor.java
+++ b/app/src/main/java/fr/themsou/monitorinternetless/commander/LocateCommandExecutor.java
@@ -3,14 +3,10 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.location.Location;
 import android.location.LocationManager;
 
 import androidx.core.content.ContextCompat;
 
-import java.util.Date;
-import java.util.concurrent.BlockingQueue;
-
 import fr.themsou.monitorinternetless.R;
 
 public class LocateCommandExecutor{
@@ -32,26 +28,10 @@ public void execute(String[] args){
             return;
         }
 
-        commandExecutor.reply(context.getString(R.string.info_localizing));
-
         Intent serviceIntent = new Intent(context, LocationService.class);
+        serviceIntent.putExtra("number", commandExecutor.fromNumber);
         ContextCompat.startForegroundService(context, serviceIntent);
 
-        BlockingQueue<Location> locationQueue = LocationService.getLocationQueue();
-
-        try{
-            Location location = locationQueue.take();
-            commandExecutor.replyAndTerminate(
-                    "Maps : https://www.google.com/maps/place/" + location.getLatitude() + "%20" + location.getLongitude() + "\n" +
-                            context.getString(R.string.info_latitude) + " : " + location.getLatitude() + "°\n" +
-                            context.getString(R.string.info_longitude) + " : " + location.getLongitude() + "°\n" +
-                            context.getString(R.string.info_accuracy) + " : " + location.getAccuracy() + " m" + "\n" +
-                            context.getString(R.string.info_bearing) + " : " + location.getBearing() + "°\n" +
-                            context.getString(R.string.info_speed) + " : " + location.getSpeed() + " m/s \n" +
-                            "Date : " + new Date(location.getTime()));
-        }catch(InterruptedException e){
-            e.printStackTrace();
-            commandExecutor.replyAndTerminate(context.getString(R.string.info_location_unknown));
-        }
+        commandExecutor.replyAndTerminate(context.getString(R.string.info_localizing));
     }
 }
diff --git a/app/src/main/java/fr/themsou/monitorinternetless/commander/LocationService.java b/app/src/main/java/fr/themsou/monitorinternetless/commander/LocationService.java
index 57bc566..a057ae5 100644
--- a/app/src/main/java/fr/themsou/monitorinternetless/commander/LocationService.java
+++ b/app/src/main/java/fr/themsou/monitorinternetless/commander/LocationService.java
@@ -19,8 +19,7 @@
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.Date;
 
 import fr.themsou.monitorinternetless.MainActivity;
 import fr.themsou.monitorinternetless.R;
@@ -28,16 +27,16 @@
 public class LocationService extends Service implements LocationListener {
 
     private LocationManager locationManager;
-
-    private static final BlockingQueue<Location> locationQueue = new LinkedBlockingQueue<>();
+    private String number;
 
     private static final int NOTIFICATION_ID = 2;
     private static final String CHANNEL_ID = "LocationService";
 
+
+
     @Override
     public void onCreate() {
         super.onCreate();
-        locationQueue.clear();
         locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
     }
 
@@ -45,7 +44,7 @@ public void onCreate() {
     @RequiresApi(api = Build.VERSION_CODES.S)
     @Override
     public int onStartCommand(Intent intent, int flags, int startId){
-
+        number = intent.getStringExtra("number");
 
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
             startForeground(NOTIFICATION_ID, createNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
@@ -60,7 +59,15 @@ public int onStartCommand(Intent intent, int flags, int startId){
     @Override
     public void onLocationChanged(@NonNull Location location) {
         Log.d(CHANNEL_ID, "Location listener called. lat,long:" + location.getLatitude() + "," + location.getLongitude());
-        locationQueue.add(location);
+
+        CommandExecutor.reply(number,
+                "Maps : https://www.google.com/maps/place/" + location.getLatitude() + "%20" + location.getLongitude() + "\n" +
+                        getString(R.string.info_latitude) + " : " + location.getLatitude() + "°\n" +
+                        getString(R.string.info_longitude) + " : " + location.getLongitude() + "°\n" +
+                        getString(R.string.info_accuracy) + " : " + location.getAccuracy() + " m" + "\n" +
+                        getString(R.string.info_bearing) + " : " + location.getBearing() + "°\n" +
+                        getString(R.string.info_speed) + " : " + location.getSpeed() + " m/s \n" +
+                        "Date : " + new Date(location.getTime()));
 
         stopForeground(true);
         stopSelf();
@@ -87,8 +94,4 @@ private Notification createNotification() {
     public IBinder onBind(Intent intent) {
         return null;
     }
-
-    public static BlockingQueue<Location> getLocationQueue() {
-        return locationQueue;
-    }
 }
diff --git a/app/src/main/java/fr/themsou/monitorinternetless/ui/commands/CommandsFragment.java b/app/src/main/java/fr/themsou/monitorinternetless/ui/commands/CommandsFragment.java
index 26b1141..34b327c 100644
--- a/app/src/main/java/fr/themsou/monitorinternetless/ui/commands/CommandsFragment.java
+++ b/app/src/main/java/fr/themsou/monitorinternetless/ui/commands/CommandsFragment.java
@@ -32,7 +32,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         listView = root.findViewById(R.id.command_listview);
         listView.addHeaderView(layoutInflater.inflate(R.layout.header_commands, null));
 
-        adapter = new CommandsListAdapter(getContext(), ((MainActivity) getActivity()), getCommands((MainActivity) getActivity()));
+        adapter = new CommandsListAdapter(getContext(), ((MainActivity) getActivity()), getCommands(getActivity()));
         listView.setAdapter(adapter);