Index: dialin/dg/flow_sensors.py
===================================================================
diff -u -rd72425a5f8916356c5d04745f5b0218e23e11105 -r4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2
--- dialin/dg/flow_sensors.py	(.../flow_sensors.py)	(revision d72425a5f8916356c5d04745f5b0218e23e11105)
+++ dialin/dg/flow_sensors.py	(.../flow_sensors.py)	(revision 4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2)
@@ -82,15 +82,15 @@
         """
         return self.measured_ro_flow_with_cp_LPM
 
-    @publish(["measured_ro_flow_LPM", "measured_dialysate_flow_LPM", "measured_concentrate_ro_flow_LPM"])
+    @publish(["measured_ro_flow_LPM", "measured_dialysate_flow_LPM", "measured_ro_flow_with_cp_LPM"])
     def _handler_flow_sensors_sync(self, message):
 
         self.measured_ro_flow_LPM = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        self.measured_ro_flow_with_cp_LPM = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
         self.measured_dialysate_flow_LPM = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.measured_concentrate_ro_flow_LPM = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
     def cmd_measured_flow_sensor_value_lpm_override(self, sensor_id: int, rate: float,  reset: int = NO_RESET) -> int:
         """
Index: tests/dg_nvm_scripts.py
===================================================================
diff -u -r1c5dbffa6b205c14f92e05badc563f2a84980bfa -r4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2
--- tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision 1c5dbffa6b205c14f92e05badc563f2a84980bfa)
+++ tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision 4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2)
@@ -69,9 +69,9 @@
     # It creates a folder called DG_NV_Records in the destination that is called
     # If no address is provided, the default location is one folder above the dialin folder wherever it is installed
     # in you computer.
-    #dg.system_record.cmd_get_dg_system_record_report()
+    dg.system_record.cmd_get_dg_system_record_report()
 
-    dg.system_record.cmd_set_dg_system_record_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-09-06-DG-Record.xlsx')
+    dg.system_record.cmd_set_dg_system_record_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-09-22-DG-Record.xlsx')
 
     # For resetting the system record to benign values, use the function below
     #dg.system_record.cmd_reset_dg_system_record()
@@ -83,11 +83,11 @@
 
     if dg.cmd_log_in_to_dg():
 
-        run_sw_configs_commands()
+        #run_sw_configs_commands()
 
         #run_calibration_commands()
 
-        #run_system_commands()
+        run_system_commands()
 
         #dg.usage_record.cmd_get_dg_usage_info_record()
         #dg.usage_record.cmd_update_dg_usage_info_record('/home/fw/projects/DG_NV_Records/2022-04-22-DG-Record.xlsx')
Index: tests/dg_tests.py
===================================================================
diff -u -r0110f05bf353d1d2b38eb530c6e588e67c8f370d -r4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 0110f05bf353d1d2b38eb530c6e588e67c8f370d)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2)
@@ -315,7 +315,10 @@
                     dg.dialysate_fill.total_volume))
     return info
 
+def get_hd_valves_info():
+    info = ('Air_trap' )
 
+
 def get_dg_idle_bad_fill_info():
     info = ('Bad_fill_state, {}, '
             .format(DGGenIdleModeBadFillSubStates(dg.gen_idle.sub_state).name))
Index: tests/hd_nvm_scripts.py
===================================================================
diff -u -r1c5dbffa6b205c14f92e05badc563f2a84980bfa -r4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2
--- tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision 1c5dbffa6b205c14f92e05badc563f2a84980bfa)
+++ tests/hd_nvm_scripts.py	(.../hd_nvm_scripts.py)	(revision 4b04e9c162a0bfb7e603e22fa0681c8ed963ddf2)
@@ -61,15 +61,33 @@
     #hd.calibration_record.cmd_reset_hd_calibration_record()
 
 
+def run_system_commands():
+    # Comment and un-comment any of the functions that you would like to use or you can use your own scripts.
+
+    # Use cmd_get_dg_system_record_report() to get the system record in an excel
+    # This function gets an address to locate the report there (i.e. /home/fw/projects/)
+    # It creates a folder called DG_NV_Records in the destination that is called
+    # If no address is provided, the default location is one folder above the dialin folder wherever it is installed
+    # in you computer.
+    hd.system_record.get_hd_system_record()
+
+    #hd.system_record.cmd_set_hd_system_record('home/fw/projects/DG_NV_Records/2022-09-06-DG-Record.xlsx')
+
+    # For resetting the system record to benign values, use the function below
+    #hd.system_record.cmd_reset_hd_system_record()
+
+
 if __name__ == "__main__":
 
     hd = HD(log_level="DEBUG")
 
     if hd.cmd_log_in_to_hd():
 
         # Comment this function if not needed
-        run_sw_configs_commands()
+        #run_sw_configs_commands()
 
         # Comment this function if not needed
         #run_calibration_commands()
 
+        run_system_commands()
+