diff --git a/MyCore/Extensions/MqttClientMerossService.cs b/MyCore/Extensions/MqttClientMerossService.cs
index 3c008c7..b414735 100644
--- a/MyCore/Extensions/MqttClientMerossService.cs
+++ b/MyCore/Extensions/MqttClientMerossService.cs
@@ -29,14 +29,14 @@ namespace Mqtt.Client.AspNetCore.Services
         private static string _secret = "23x17ahWarFH6w29";
         private string _loginUrl = $"{_merossUrl}/v1/Auth/Login";
         private string _logUrl = $"{_merossUrl}/v1/log/user";
-        private string _devList = $"{_merossUrl}/v1/Device/devList";
+        private static string _devList = $"{_merossUrl}/v1/Device/devList";
 
         private static string username = "thomas.fransolet@hotmail.be";
         private static string password = "Coconuts07";
 
         private static ResultToken resultToken;
 
-        private List<MerossDevice> allDevices;
+        private static List<MerossDevice> allDevices;
 
         // API MQTT
         private const int port = 2001;
diff --git a/MyCore/Services/Devices/ActionService.cs b/MyCore/Services/Devices/ActionService.cs
index 9c746ce..798a440 100644
--- a/MyCore/Services/Devices/ActionService.cs
+++ b/MyCore/Services/Devices/ActionService.cs
@@ -57,7 +57,7 @@ namespace MyCore.Services.Devices
                                         /*foreach (var channel in multiprise.channels)
                                         {
                                             if (i != 0)
-                                                MerossService.ExecuteCommand(multiprise.ServiceIdentification, Method.SET, CommandMqtt.TOGGLEX, "", "", ToggleStatus.OFF, i);
+                                                MqttClientMerossService.ExecuteCommand(multiprise.ServiceIdentification, Method.SET, CommandMqtt.TOGGLEX, "", "", ToggleStatus.OFF, i);
                                             i++;
                                         }*/
                                         MqttClientMerossService.ExecuteCommand(multiprise.ServiceIdentification, Method.SET, CommandMqtt.TOGGLEX, "", "", ToggleStatus.ON, 1);
diff --git a/MyCore/Services/Devices/MQTTService.cs b/MyCore/Services/Devices/MQTTService-OLD.cs
similarity index 100%
rename from MyCore/Services/Devices/MQTTService.cs
rename to MyCore/Services/Devices/MQTTService-OLD.cs