diff --git a/classCAN.py b/classCAN.py
index a04a0ed..27ffbf5 100644
--- a/classCAN.py
+++ b/classCAN.py
@@ -75,10 +75,10 @@ class CANBackend:
                             ps4 = node.sdo[0x2005][4].raw
 
                             self.latest_data[pu_number] = {
-                                "FM1": fm1 / 100.0,
-                                "FM2": fm2 / 100.0,
-                                "FM3": fm3 / 100.0,
-                                "FM4": fm4 / 100.0,
+                                "FM1": (fm1 / 100.0) * 60.0,
+                                "FM2": (fm2 / 100.0) * 60.0,
+                                "FM3": (fm3 / 100.0) * 60.0,
+                                "FM4": (fm4 / 100.0) * 60.0,
                                 "PS1": ps1 / 1000.0,
                                 "PS2": ps2 / 1000.0,
                                 "PS3": ps3 / 1000.0,
diff --git a/main.py b/main.py
index 8e5b2a0..31f9bde 100644
--- a/main.py
+++ b/main.py
@@ -166,14 +166,17 @@ def get_pu_status():
 def get_monitor_data(pu_number: Optional[int] = Query(None)):
     def format_data(data):
         return {
-            "Qperm": data.get("FM1", 0.0),
-            "Qdilute": data.get("FM2", 0.0),
-            "Qdrain": data.get("FM3", 0.0),
-            "Qrecirc": data.get("FM4", 0.0),
+            "Qperm": data.get("FM2", 0.0),
+            "Qdilute": data.get("FM1", 0.0),
+            "Qdrain": data.get("FM4", 0.0),
+            "Qrecirc": data.get("FM3", 0.0),
+
             "Pro": data.get("PS1", 0.0),
-            "Pdilute": data.get("PS2", 0.0),
-            "Prentate": data.get("PS3", 0.0),
+            "Pdilute": data.get("PS3", 0.0),
+            "Prentate": data.get("PS2", 0.0),
+
             "Conductivity": data.get("Cond", 0.0),
+
             "MV02": data.get("MV02", 0.0),
             "MV02_sp": data.get("MV02_sp", 0.0),
             "MV03": data.get("MV03", 0.0),
@@ -187,18 +190,12 @@ def get_monitor_data(pu_number: Optional[int] = Query(None)):
             "MV08": data.get("MV08", 0.0),
             "MV08_sp": data.get("MV08_sp", 0.0),
         }
-
-    if pu_number is not None:
-        data = can_backend.get_latest_data(pu_number)
-        print(f"[MONITOR] PU{pu_number}: {data}")
-        return format_data(data)
-    else:
-        all_data = {}
-        for pu in [1, 2, 3]:
-            data = can_backend.get_latest_data(pu)
-            print(f"[MONITOR] PU{pu}: {data}")
-            all_data[f"PU_{pu}"] = format_data(data)
-        return all_data
+    all_data = {}
+    for pu in [1, 2, 3]:
+        data = can_backend.get_latest_data(pu)
+        print(f"[MONITOR] PU{pu}: {data}")
+        all_data[f"PU_{pu}"] = format_data(data)
+    return all_data
 
 
 @app.get("/can_status")