diff --git a/src/C++/Driver/CMakeLists.txt b/src/C++/Driver/CMakeLists.txt
index ced9869..aea8ac1 100644
--- a/src/C++/Driver/CMakeLists.txt
+++ b/src/C++/Driver/CMakeLists.txt
@@ -1,14 +1,23 @@
 cmake_minimum_required(VERSION 3.9)
 project(kobuki_control)
+set(CMAKE_CXX_STANDARD 23)
+
+# Find the Paho MQTT C++ library (static)
+find_library(PAHO_MQTTPP_LIBRARY_STATIC paho-mqttpp3.a PATHS /usr/local/lib)
+find_library(PAHO_MQTT_LIBRARY_STATIC paho-mqtt3a.a PATHS /usr/local/lib)
+
+include_directories(/usr/local/include)
 
 set(SOURCE_FILES
-        src/KobukiDriver/KobukiParser.cpp
-        src/KobukiDriver/KobukiParser.h
-        src/KobukiDriver/CKobuki.cpp
-        src/KobukiDriver/CKobuki.h
-        src/MQTT/MqttClient.cpp
-        src/MQTT/MqttClient.h
-        src/main.cpp)
+    src/KobukiDriver/KobukiParser.cpp
+    src/KobukiDriver/KobukiParser.h
+    src/KobukiDriver/CKobuki.cpp
+    src/KobukiDriver/CKobuki.h
+    src/MQTT/MqttClient.cpp
+    src/MQTT/MqttClient.h
+    src/main.cpp)
 
 add_executable(kobuki_control ${SOURCE_FILES})
-#target_link_libraries(kobuki_control )
\ No newline at end of file
+
+# Link the static libraries
+target_link_libraries(kobuki_control ${PAHO_MQTTPP_LIBRARY_STATIC} ${PAHO_MQTT_LIBRARY_STATIC} pthread)
\ No newline at end of file
diff --git a/src/C++/Driver/src/MQTT/CMakeLists.txt b/src/C++/Driver/src/MQTT/CMakeLists.txt
index ad70666..ef88b41 100644
--- a/src/C++/Driver/src/MQTT/CMakeLists.txt
+++ b/src/C++/Driver/src/MQTT/CMakeLists.txt
@@ -22,7 +22,6 @@ set(SOURCE_FILES
 add_executable(mqtt_receiver ${SOURCE_FILES})
 
 # Link the libraries
-target_link_libraries(mqtt_receiver ${PAHO_MQTTPP_LIBRARY} ${PAHO_MQTT_LIBRARY})
 
 # Include directories for headers
 target_include_directories(mqtt_receiver PRIVATE)
diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp
index fd7b1ae..0208a9d 100644
--- a/src/C++/Driver/src/main.cpp
+++ b/src/C++/Driver/src/main.cpp
@@ -9,7 +9,7 @@
 using namespace std;
 CKobuki robot;
 int movement();
-std::string ReadMQTT();
+std::string readMQTT();
 MqttClient client("mqtt://localhost:1883", "KobukiRPI", "ishak", "kobuki");
 
 
@@ -21,16 +21,12 @@ void setup(){
 
 }
 
-int main()
+int main(){
 	setup();
-{
-
-readMQTT();
-
-	return 0;
+	readMQTT();
 }
 
-std::string ReadMQTT()
+std::string readMQTT()
 {
     while (true) {
         std::string message = client.getLastMessage();