Index: dialin/dg/concentrate_pumps.py
===================================================================
diff -u -r4f842806d2066d3e8df4ed2b70d09efc8751e8b2 -rde0e1f2ae881066bb34b6ebc4c9a219389bd988f
--- dialin/dg/concentrate_pumps.py	(.../concentrate_pumps.py)	(revision 4f842806d2066d3e8df4ed2b70d09efc8751e8b2)
+++ dialin/dg/concentrate_pumps.py	(.../concentrate_pumps.py)	(revision de0e1f2ae881066bb34b6ebc4c9a219389bd988f)
@@ -58,21 +58,24 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_concentrate_pumps_sync)
 
-        self.concentrate_pump_cp1_target = 0.0
-        self.concentrate_pump_cp1 = 0.0
-        self.concentrate_pump_cp2_target = 0.0
-        self.concentrate_pump_cp2 = 0.0
+        self.concentrate_pump_cp1_current_set_speed = 0.0
+        self.concentrate_pump_cp1_measured_speed = 0.0
+        self.concentrate_pump_cp2_current_set_speed = 0.0
+        self.concentrate_pump_cp2_measured_speed = 0.0
 
     def get_concentrate_pumps(self):
         """
         Gets the current concentrate pump data value
 
         @return: List containing concentrate pump data values:
-            [ concentrate_pump_cp1_target, concentrate_pump_cp1, concentrate_pump_cp2_target, concentrate_pump_cp2 ]
+            [ concentrate_pump_cp1_current_set_speed, concentrate_pump_cp1_measured_speed,
+              concentrate_pump_cp2_current_set_speed, concentrate_pump_cp2_measured_speed ]
         """
-        return [self.concentrate_pump_cp1_target, self.concentrate_pump_cp1, self.concentrate_pump_cp2_target, self.concentrate_pump_cp2]
+        return [self.concentrate_pump_cp1_current_set_speed, self.concentrate_pump_cp1_measured_speed,
+                self.concentrate_pump_cp2_current_set_speed, self.concentrate_pump_cp2_measured_speed]
 
-    @_publish(["concentrate_pump_cp1_target", "concentrate_pump_cp1", "concentrate_pump_cp2_target", "concentrate_pump_cp2"])
+    @_publish(["concentrate_pump_cp1_current_set_speed", "concentrate_pump_cp1_measured_speed",
+               "concentrate_pump_cp2_current_set_speed", "concentrate_pump_cp2_measured_speed"])
     def _handler_concentrate_pumps_sync(self, message):
         """
         Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured
@@ -82,15 +85,15 @@
         @return: None
         """
 
-        cp1_target = struct.unpack('f', bytearray(message['message'][self.START_POS_CP1_TARGET:self.END_POS_CP1_TARGET]))
-        cp1 = struct.unpack('f', bytearray(message['message'][self.START_POS_CP1:self.END_POS_CP1]))
-        cp2_target = struct.unpack('f', bytearray(message['message'][self.START_POS_CP2_TARGET:self.END_POS_CP2_TARGET]))
-        cp2 = struct.unpack('f', bytearray(message['message'][self.START_POS_CP2:self.END_POS_CP2]))
+        cp1_current = struct.unpack('f', bytearray(message['message'][self.START_POS_CP1_TARGET:self.END_POS_CP1_TARGET]))
+        cp1_measured = struct.unpack('f', bytearray(message['message'][self.START_POS_CP1:self.END_POS_CP1]))
+        cp2_current = struct.unpack('f', bytearray(message['message'][self.START_POS_CP2_TARGET:self.END_POS_CP2_TARGET]))
+        cp2_measured = struct.unpack('f', bytearray(message['message'][self.START_POS_CP2:self.END_POS_CP2]))
 
-        self.concentrate_pump_cp1_target = cp1_target[0]
-        self.concentrate_pump_cp1 = cp1[0]
-        self.concentrate_pump_cp2_target = cp2_target[0]
-        self.concentrate_pump_cp2 = cp2[0]
+        self.concentrate_pump_cp1_current_set_speed = cp1_current[0]
+        self.concentrate_pump_cp1_measured_speed = cp1_measured[0]
+        self.concentrate_pump_cp2_current_set_speed = cp2_current[0]
+        self.concentrate_pump_cp2_measured_speed = cp2_measured[0]
 
     def cmd_concentrate_pump_state_change_request(self, pump_id, on=False):
         """
Index: dialin/dg/conductivity_sensors.py
===================================================================
diff -u -rcc425128f399de5414b0aee1942986653ca42c92 -rde0e1f2ae881066bb34b6ebc4c9a219389bd988f
--- dialin/dg/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision cc425128f399de5414b0aee1942986653ca42c92)
+++ dialin/dg/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision de0e1f2ae881066bb34b6ebc4c9a219389bd988f)
@@ -81,13 +81,13 @@
         cpi = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
         cpo = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
         cd1 = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        #cd2 = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
+        cd2 = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
 
         self.ro_rejection_ratio = ro_rejection_ratio[0]
         self.conductivity_sensor_cpi = cpi[0]
         self.conductivity_sensor_cpo = cpo[0]
         self.conductivity_sensor_cd1 = cd1[0]
-        #self.conductivity_sensor_cd2 = cd2[0]
+        self.conductivity_sensor_cd2 = cd2[0]
 
     def cmd_conductivity_sensor_override(self, conductivity, sensor, reset=NO_RESET):
         """
@@ -101,6 +101,8 @@
         Conductivity sensor IDs: \n
             0 = CPI \n
             1 = CPO \n
+            2 = CD1 \n
+            3 = CD2 \n
         """
 
         reset_byte_array = integer_to_bytearray(reset)