diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index b939c020bd49be3e451833bc61e430b93a1848ec..4e9b11b4d077cda8ee8448fee5abb4dc1cf65a8c 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -301,14 +301,14 @@ void RefuelingVisualizer::setupUi()
     outerLayout->addWidget(cartFillingPressureDataLabel, 2590, 2940, 34, 1047);
 
     cartBatteryDataLabel = new QLabel;
-    cartBatteryDataLabel->setText((QString) "0.000    %");
+    cartBatteryDataLabel->setText((QString) "0.000      V");
     cartBatteryDataLabel->setAlignment(Qt::AlignRight);
     cartBatteryDataLabel->setContentsMargins(4, 4, 4, 4);
     cartBatteryDataLabel->setStyleSheet(dataStyle);
     outerLayout->addWidget(cartBatteryDataLabel, 2630, 2940, 34, 1047);
 
     cartCurrentDataLabel = new QLabel;
-    cartCurrentDataLabel->setText((QString) "0.000      V");
+    cartCurrentDataLabel->setText((QString) "0.000      A");
     cartCurrentDataLabel->setAlignment(Qt::AlignRight);
     cartCurrentDataLabel->setContentsMargins(4, 4, 4, 4);
     cartCurrentDataLabel->setStyleSheet(dataStyle);
@@ -482,21 +482,54 @@ void RefuelingVisualizer::onMsgReceivedGSE(const Message& msg)
     // Change background and tabs
     backgroundTabs(msg);
 
+    // RETRIEVE DATA
+    // Vessel
     float vesselLoadcell = msg.getField("loadcell_vessel").getDouble();
     float vesselPressure = msg.getField("vessel_pressure").getDouble();
-
-    // Change data inside labels
+    // Tank
+    float tankLoadcell = msg.getField("loadcell_tank").getDouble();
+    // Cart
+    uint64_t timestamp       = msg.getField("timestamp").getUnsignedInteger();
+    float fillingPressure    = msg.getField("filling_pressure").getDouble();
+    float batteryVoltage     = msg.getField("battery_voltage").getDouble();
+    float currentConsumption = msg.getField("current_consumption").getDouble();
+
+    // CHANGE LABELS
+    // Vessel
     loadcellVesselDataLabel->setText(QString::number(vesselLoadcell, 'f', 3) +
                                      "    KG");
     vesselPressureDataLabel->setText(QString::number(vesselPressure, 'f', 3) +
                                      "   bar");
+    // Tank
+    loadcellTankDataLabel->setText(QString::number(tankLoadcell, 'f', 3) +
+                                   "    KG");
+    // Cart
+    cartTimestampDataLabel->setText(QString::number(timestamp / 1000, 'f', 3) +
+                                    "      s");
+    cartFillingPressureDataLabel->setText(
+        QString::number(fillingPressure, 'f', 3) + "   bar");
+    cartBatteryDataLabel->setText(QString::number(batteryVoltage, 'f', 3) +
+                                  "      V");
+    cartCurrentDataLabel->setText(QString::number(currentConsumption, 'f', 3) +
+                                  "      A");
 }
 
 void RefuelingVisualizer::onMsgReceivedMOT(const Message& msg)
 {
+    // RETRIEVE DATA
+    // Tank
     float tankTemperature = msg.getField("tank_temperature").getDouble();
+    float tankTOPpressure = msg.getField("top_tank_pressure").getDouble();
+    float tankBOTpressure = msg.getField("bottom_tank_pressure").getDouble();
+    // uint8_t floatingLevel =
+    // msg.getField("floating_level").getUnsignedInteger();
 
-    // Change data inside labels
+    // CHANGE LABELS
+    // Tank
     tankTemperatureDataLabel->setText(QString::number(tankTemperature, 'f', 3) +
                                       "    °C");
+    topTankPressureDataLabel->setText(QString::number(tankTOPpressure, 'f', 3) +
+                                      "   bar");
+    bottomTankPressureDataLabel->setText(
+        QString::number(tankBOTpressure, 'f', 3) + "   bar");
 }