Index: dialin/common/msg_ids.py
===================================================================
diff -u -r5ed141e2ddc52ed90e7e9759441dd80ddf025e27 -rd1bd7b36a7268939ff25d876fee06913e1f1c2c8
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 5ed141e2ddc52ed90e7e9759441dd80ddf025e27)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision d1bd7b36a7268939ff25d876fee06913e1f1c2c8)
@@ -7,8 +7,8 @@
 #
 # @file    msg_ids.py
 #
-# @author  (last)      Sean Nash
-# @date    (last)      29-Jul-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      04-Sep-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Apr-2021
 #
Index: dialin/dg/load_cells.py
===================================================================
diff -u -r959671dcd5f7a31f10cfa4e6dba198f185d4e046 -rd1bd7b36a7268939ff25d876fee06913e1f1c2c8
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision 959671dcd5f7a31f10cfa4e6dba198f185d4e046)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision d1bd7b36a7268939ff25d876fee06913e1f1c2c8)
@@ -7,8 +7,8 @@
 #
 # @file    load_cells.py
 #
-# @author  (last)      Sean Nash
-# @date    (last)      12-Nov-2021
+# @author  (last)      Dara Navaei
+# @date    (last)      23-Aug-2022
 # @author  (original)  Sean
 # @date    (original)  14-Apr-2020
 #
Index: dialin/dg/voltages.py
===================================================================
diff -u -rd759d3a2a1aed849da9ad9153f268eb9f8b1f6f6 -rd1bd7b36a7268939ff25d876fee06913e1f1c2c8
--- dialin/dg/voltages.py	(.../voltages.py)	(revision d759d3a2a1aed849da9ad9153f268eb9f8b1f6f6)
+++ dialin/dg/voltages.py	(.../voltages.py)	(revision d1bd7b36a7268939ff25d876fee06913e1f1c2c8)
@@ -7,8 +7,8 @@
 #
 # @file    voltages.py
 #
-# @author  (last)      Quang Nguyen
-# @date    (last)      30-Aug-2021
+# @author  (last)      Darren Cox
+# @date    (last)      11-Aug-2022
 # @author  (original)  Sean Nash
 # @date    (original)  22-Apr-2021
 #
Index: tests/dg_tests.py
===================================================================
diff -u -r68b0243e27e4a5b5b796090b41c5755e207a4a45 -rd1bd7b36a7268939ff25d876fee06913e1f1c2c8
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 68b0243e27e4a5b5b796090b41c5755e207a4a45)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision d1bd7b36a7268939ff25d876fee06913e1f1c2c8)
@@ -8,7 +8,7 @@
 # @file    dg_tests.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      26-Jul-2022
+# @date    (last)      04-Sep-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  16-Jan-2022
 #
@@ -180,13 +180,12 @@
 
 
 def get_ro_info():
-    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, Dia_flow, {:5.3f}, '
+    info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, '
             'Feedback_PWM, {:5.3f}, Flow_with_conc_pumps, {:5.3f}, Dialysate_flow, {:5.3f}, '
             .format(dg.ro_pump.ro_pump_state, dg.pressures.ro_pump_inlet_pressure,
                     dg.pressures.ro_pump_outlet_pressure, dg.ro_pump.pwm_duty_cycle_pct,
-                    dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm, dg.flow_sensors.measured_dialysate_flow_LPM,
-                    dg.ro_pump.feedback_duty_cycle_pct, dg.ro_pump.measured_raw_flow_rate_with_conc_pumps_mlp,
-                    dg.flow_sensors.measured_dialysate_flow_LPM))
+                    dg.flow_sensors.measured_ro_flow_LPM, dg.ro_pump.feedback_duty_cycle_pct,
+                    dg.flow_sensors.measured_ro_flow_with_cp_LPM,  dg.flow_sensors.measured_dialysate_flow_LPM))
     return info
 
 
Index: tests/hd_nvm_scripts.py
===================================================================
diff -u -r5ed141e2ddc52ed90e7e9759441dd80ddf025e27 -rd1bd7b36a7268939ff25d876fee06913e1f1c2c8
--- tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision 5ed141e2ddc52ed90e7e9759441dd80ddf025e27)
+++ tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision d1bd7b36a7268939ff25d876fee06913e1f1c2c8)
@@ -8,7 +8,7 @@
 # @file    hd_nvm_scripts.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      26-Jul-2022
+# @date    (last)      04-Sep-2022
 # @author  (original)  Dara Navaei
 # @date    (original)  10-Feb-2022
 #