Index: leahi_dialin/dd/modules/piston_pump.py
===================================================================
diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -rdfbb4f080638b65d9836b22bd5c76d46d53abba5
--- leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision 9466b5c6b5867f392104a42608aa9542a7ff0358)
+++ leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision dfbb4f080638b65d9836b22bd5c76d46d53abba5)
@@ -151,7 +151,7 @@
         cyc = integer_to_bytearray(count)
         spd = float_to_bytearray(flow_rate)
         vlm = float_to_bytearray(volume)
-        payload = pmp + cmd + cyc + spd + vlm
+        payload = pmp + cmd + cyc + vlm + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
                                               message_id=MsgIds.MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST.value,
Index: leahi_dialin/dd/proxies/td_proxy.py
===================================================================
diff -u -rb5aa0da384c5cc177f83d59aa221ae28881cd26a -rdfbb4f080638b65d9836b22bd5c76d46d53abba5
--- leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision b5aa0da384c5cc177f83d59aa221ae28881cd26a)
+++ leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision dfbb4f080638b65d9836b22bd5c76d46d53abba5)
@@ -105,4 +105,4 @@
                                               payload=payload)
 
         self.logger.debug("Sending TD gen dialysate data request to DD.")
-        self.can_interface.send(message, 0)
\ No newline at end of file
+        self.can_interface.send(message, 0)
Index: leahi_dialin/ro/modules/boost_pump.py
===================================================================
diff -u -r7ae7087e830140ab07b841b2c0ff437269a5fc2f -rdfbb4f080638b65d9836b22bd5c76d46d53abba5
--- leahi_dialin/ro/modules/boost_pump.py	(.../boost_pump.py)	(revision 7ae7087e830140ab07b841b2c0ff437269a5fc2f)
+++ leahi_dialin/ro/modules/boost_pump.py	(.../boost_pump.py)	(revision dfbb4f080638b65d9836b22bd5c76d46d53abba5)
@@ -16,7 +16,9 @@
 import struct
 from enum import unique
 from logging import Logger
+from enum import unique
 
+from leahi_dialin.utils.base import DialinEnum
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
@@ -29,6 +31,7 @@
     P12_PUMP_RO = 0
     P40_PUMP_BOOSTER = 1
 
+
 class ROPumps(AbstractSubSystem):
     """
         Dialin API sub-class for RO pump related commands.
Index: leahi_dialin/ro/modules/levels.py
===================================================================
diff -u -rc995ca1d69740f4219344c9c85cf3e332fdd9f22 -rdfbb4f080638b65d9836b22bd5c76d46d53abba5
--- leahi_dialin/ro/modules/levels.py	(.../levels.py)	(revision c995ca1d69740f4219344c9c85cf3e332fdd9f22)
+++ leahi_dialin/ro/modules/levels.py	(.../levels.py)	(revision dfbb4f080638b65d9836b22bd5c76d46d53abba5)
@@ -23,8 +23,16 @@
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
-from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
+from leahi_dialin.utils.conversions import integer_to_bytearray
 
+@unique
+class ROFloaterLevels(DialinEnum):
+    LEVEL_STATE_LOW = 0
+    LEVEL_STATE_HIGH = 1
+    LEVEL_STATE_MEDIUM = 2
+    LEVEL_STATE_ILLEGAL = 3
+
+
 class ROLevels(AbstractSubSystem):
     """
 
@@ -98,7 +106,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int:
+    def cmd_level_state_override(self, level: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends level status override command.
             Must be logged into RO.
@@ -109,9 +117,8 @@
         @returns 1 if successful, zero otherwise
         """
         reset_value = integer_to_bytearray(reset)
-        lvl = integer_to_bytearray(level_sensor)
-        sts = integer_to_bytearray(status)
-        payload = reset_value + sts + lvl
+        lvl = integer_to_bytearray(level)
+        payload = reset_value + lvl
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_LEVELS_STATUS_OVERRIDE_REQUEST.value,
                                               payload=payload)
Index: leahi_dialin/ro/modules/valves.py
===================================================================
diff -u -r08788e287361f923cf39a9b6dc83522bf80d5a58 -rdfbb4f080638b65d9836b22bd5c76d46d53abba5
--- leahi_dialin/ro/modules/valves.py	(.../valves.py)	(revision 08788e287361f923cf39a9b6dc83522bf80d5a58)
+++ leahi_dialin/ro/modules/valves.py	(.../valves.py)	(revision dfbb4f080638b65d9836b22bd5c76d46d53abba5)
@@ -229,13 +229,13 @@
             Given valve ID must be one of the valve IDs listed below.
 
         @param valve:  unsigned int - valve ID
-        @param state:  int - valve state
+        @param state:  int - valve state  (0=de-energized/closed, 1=energized/open)
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
 
         rst = integer_to_bytearray(reset)
-        ste = integer_to_bytearray(int(state))
+        ste = integer_to_bytearray(state)
         vlv = integer_to_bytearray(valve)
         payload = rst + ste + vlv
 
Index: leahi_dialin/ro/reverse_osmosis.py
===================================================================
diff -u -rd0317f547a6bc62524b8ffa40b473e8a489d35d6 -rdfbb4f080638b65d9836b22bd5c76d46d53abba5
--- leahi_dialin/ro/reverse_osmosis.py	(.../reverse_osmosis.py)	(revision d0317f547a6bc62524b8ffa40b473e8a489d35d6)
+++ leahi_dialin/ro/reverse_osmosis.py	(.../reverse_osmosis.py)	(revision dfbb4f080638b65d9836b22bd5c76d46d53abba5)
@@ -18,6 +18,7 @@
 from .modules.conductivity_sensors import ROConductivitySensors
 from .modules.flow_sensors import ROFlowSensors
 from .modules.boost_pump import ROPumps
+from .modules.flow_sensors import ROFlowSensors
 from .modules.levels import ROLevels
 from .modules.pressure_sensors import ROPressureSensors
 from .modules.valves import ROValves
@@ -106,6 +107,7 @@
         self.conductivity = ROConductivitySensors(self.can_interface, self.logger)
         self.flows = ROFlowSensors(self.can_interface, self.logger)
         self.pumps = ROPumps(self.can_interface, self.logger)
+        self.flows = ROFlowSensors(self.can_interface, self.logger)
         self.levels = ROLevels(self.can_interface, self.logger)
         self.pressures = ROPressureSensors(self.can_interface, self.logger)
         self.valves = ROValves(self.can_interface, self.logger)