diff --git a/pps_ws/src/d_fall_pps/CMakeLists.txt b/pps_ws/src/d_fall_pps/CMakeLists.txt
index 5aa50bc4856fa4dab2fffd64ce14337e8eedbc44..812daab1c972412a7373c21d56dd2dbf76ac63e8 100755
--- a/pps_ws/src/d_fall_pps/CMakeLists.txt
+++ b/pps_ws/src/d_fall_pps/CMakeLists.txt
@@ -237,7 +237,7 @@ set(MY_CPP_SOURCES              # compilation of sources
     ${MY_LIB_PATH_SRC}/rosNodeThread.cpp
     ${MY_LIB_PATH_SRC}/crazyFly.cpp
     ${MY_LIB_PATH_SRC}/CFLinker.cpp
-    ${MY_LIB_PATH_SRC}/addressLUT.cpp
+    ${MY_LIB_PATH_SRC}/channelLUT.cpp
     )
 
 
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/addressLUT.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
similarity index 60%
rename from pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/addressLUT.h
rename to pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
index ac92f8715c3d6b34d2008604190ce6e2ccefea42..e521fc3981804ff09bc04ee488d206132654e217 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/addressLUT.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
@@ -5,6 +5,6 @@
 #include <map>
 
 
-extern std::map<std::string, std::string> address_LUT;
+extern std::map<std::string, std::string> channel_LUT;
 
 #endif
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp
deleted file mode 100644
index 6210de02b031a960f34a4e5ae139e20ef3ff79a3..0000000000000000000000000000000000000000
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/addressLUT.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "addressLUT.h"
-
-
-std::map<std::string, std::string> address_LUT
-{
-    {"CF1", "A12D2"},
-    {"CF2", "E341E"},
-    {"CF3", "4E21A"},
-};
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..dc8e61f1558e66d0c94472e687526635f49e00b3
--- /dev/null
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
@@ -0,0 +1,13 @@
+#include "channelLUT.h"
+
+
+std::map<std::string, std::string> channel_LUT
+{
+    // {"CF1", "A12D2"},
+    // {"CF2", "E341E"},
+    // {"CF3", "4E21A"},
+    {"cfOne", "0/76/2M"},
+    {"cfTwo", "0/69/2M"},
+    {"cfThree", "0/72/2M"},
+    {"cfFour", "0/99/2M"},
+};
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
index 606e543242b472c0e424a4f9c8bc4bde85afc8cd..61736d5778e8e626c7558c05ec4357571b31eff2 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
@@ -3,7 +3,7 @@
 #include "crazyFlyZoneTab.h"
 #include "myGraphicsScene.h"
 #include "myGraphicsView.h"
-#include "addressLUT.h"
+#include "channelLUT.h"
 
 #include <QObject>
 #include <QDoubleSpinBox>
@@ -884,8 +884,8 @@ void MainGUIWindow::on_load_from_DB_button_clicked()
 void MainGUIWindow::on_comboBoxCFs_currentTextChanged(const QString &arg1)
 {
     std::string key = arg1.toStdString();
-    auto it = address_LUT.find(key);
-    if(it != address_LUT.end())
+    auto it = channel_LUT.find(key);
+    if(it != channel_LUT.end())
     {
         std::string found = it->second;
         QString found_qstr = QString::fromStdString(found);
diff --git a/pps_ws/src/d_fall_pps/param/Crazyflie.db b/pps_ws/src/d_fall_pps/param/Crazyflie.db
index 2c6f791e7c89155cf4035ced199a06a8c8a0580f..cf9a23ba0d871544275e8abeb7d4d486154b344c 100644
--- a/pps_ws/src/d_fall_pps/param/Crazyflie.db
+++ b/pps_ws/src/d_fall_pps/param/Crazyflie.db
@@ -1,3 +1 @@
-1,CF1,A12D2,0,0.180387,0.712283,-0.2,1.77763,1.34043,2
-2,CF2,E341E,1,-0.628728,-0.48753,-0.2,0.971272,0.52247,2
-3,CF3,4E21A,2,0.425248,-1.49146,-0.2,1.66704,-0.577371,2
+2,cfOne,0/76/2M,0,-4.33627,-2.87329,-0.2,4.64523,3.23321,2
diff --git a/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp b/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp
index ec636e50ddc891f6d9902bfa795e610250946e97..2067c20eda580ac25e870ce9e3e20876929cb1fd 100755
--- a/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp
+++ b/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp
@@ -20,7 +20,7 @@
 #include "d_fall_pps/ViconData.h"
 #include "d_fall_pps/UnlabeledMarker.h"
 
-#define TESTING_FAKE_DATA
+// #define TESTING_FAKE_DATA
 
 // notice that unit here are in milimeters
 using namespace ViconDataStreamSDK::CPP;