Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -rb4e77cdb95bebe6ba3fc49c2389d7e6127a81e9c -r0b843faddee1416bfddb6f2589aedecf950c6df8
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision b4e77cdb95bebe6ba3fc49c2389d7e6127a81e9c)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 0b843faddee1416bfddb6f2589aedecf950c6df8)
@@ -234,7 +234,7 @@
 
         vlv = integer_to_bytearray(valve)
         sts = integer_to_bytearray(valve_state)
-        payload = sts + vlv
+        payload = vlv + sts
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
                                               message_id=MsgIds.MSG_ID_TD_2_WAY_VALVE_SET_STATE_REQUEST.value,
Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -raae7cf9572341210bec33e161c0cefa109d4c07c -r0b843faddee1416bfddb6f2589aedecf950c6df8
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision aae7cf9572341210bec33e161c0cefa109d4c07c)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 0b843faddee1416bfddb6f2589aedecf950c6df8)
@@ -68,20 +68,17 @@
     @publish(["td_air_bubbles_timestamp", "h18_air_bubbles_status", "h18_air_bubbles_state"])
     def _handler_air_bubbles_data_sync(self, message, timestamp=0.0):
         """
-        Handles published air bubbles data messages. Air bubble status and state are captured
-        for ADV detector.
+        Handles published air bubbles data messages. Air bubble status and state are captured.
 
-        @param message:  published air bubbles data message as: ADV status, ADV state
+        @param message:  published air bubbles data message as: h18 bubble status, b18 bubble state
         @return: None
         """
 
-        adv_status = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        adv_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
+        self.h18_air_bubbles_status = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        self.h18_air_bubbles_state = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.h18_air_bubbles_status = [adv_status[0]]
-        self.h18_air_bubbles_state = [adv_state[0]]
         self.td_air_bubbles_timestamp = timestamp
 
     def cmd_air_bubble_status_override(self, index: int, status: int, reset: int = NO_RESET) -> int: