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 c2ba86f192f4281e0ee249be2ba9e50f050104fc..0821c00161ccfa50a3956d041232e0fa5428af34 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
@@ -63,12 +63,6 @@ int MainGUIWindow::getTabIndexFromName(QString name)
 
 void MainGUIWindow::doNumCrazyFlyZonesChanged(int n)
 {
-    // FIXME: when we load CF Zones from database, more than one at a time. Change way of updating tabs!
-    // Maybe remove everything and create new ones always?
-
-    // PROBLEM is related to removing of the last tab, not to anything else. WHY?
-
-
     // tabs number management, maybe do it in a different way so we dont have to remove and add everything?
     // first check if size of tabs is greater than size of vector or viceversa. Have we removed or added a zone?
 
@@ -107,40 +101,6 @@ void MainGUIWindow::doNumCrazyFlyZonesChanged(int n)
         connect(widget, SIGNAL(centerButtonClickedSignal(int)), this, SLOT(centerViewIndex(int)));
     }
 
-    // for(int index = 0; index < ui->tabWidget->count(); index++)
-    // {
-    //     // ui->tabWidget->removeTab(index);
-    //     ui->tabWidget->widget(index)->deleteLater();
-    // }
-
-    // // unlink all?
-    // // cf_linker->clear_all_links();
-
-    // ui->tabWidget->clear();
-
-    // for(int i = 0; i < scene->crazyfly_zones.size(); i++)
-    // {
-    //     ROS_INFO("inside for loop");
-    //     QString qstr = "CrazyFly ";
-    //     int CF_index = scene->crazyfly_zones[i]->getIndex();
-    //     qstr.append(QString::number(CF_index + 1));
-    //     crazyFlyZoneTab* widget = new crazyFlyZoneTab(i);
-    //     // ui->tabWidget->insertTab(i, widget, qstr);
-    //     ui->tabWidget->addTab(widget, qstr);
-    //     ROS_INFO("Added tab");
-    //     connect(widget, SIGNAL(centerButtonClickedSignal(int)), this, SLOT(centerViewIndex(int)));
-    // }
-
-
-    // for(int i = 0; i < n; i++)
-    // {
-    //     QString qstr = "Crazyfly ";
-    //     qstr.append(QString::number(i+1));
-    //     crazyFlyZoneTab* widget = new crazyFlyZoneTab(i);
-    //     ui->tabWidget->insertTab(i, widget, qstr);
-    //     connect(widget, SIGNAL(centerButtonClickedSignal(int)), this, SLOT(centerViewIndex(int)));
-    // }
-
     updateComboBoxesCFZones();
 }
 
diff --git a/pps_ws/src/d_fall_pps/param/Crazyflie.db b/pps_ws/src/d_fall_pps/param/Crazyflie.db
index 8b5dace76c5fb24625f3bc80dbb4e29dd6654395..454f843a71d648b94b8dd6671c738a636974775e 100644
--- a/pps_ws/src/d_fall_pps/param/Crazyflie.db
+++ b/pps_ws/src/d_fall_pps/param/Crazyflie.db
@@ -1,2 +1,2 @@
 2,CF1,1,0,0.52,0.41,-0.2,1.56,1.55,2
-1,CF2,3,1,-1.15,-0.69,-0.2,0.94,0.46,2
+1,CF2,2,1,-1.62398,-1.65338,-0.2,1.70872,0.674222,2