Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rf3646622112ca7402527b541766b92a6560f2b17
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f3646622112ca7402527b541766b92a6560f2b17)
@@ -32,17 +32,18 @@
 static const COMM_BUFFER_T tdResponseBuffers[ NUM_OF_COMM_BUFFERS ] =
 {
     COMM_BUFFER_NOT_USED,                                   ///< CAN message boxes start at 1 so we will not use this buffer
-    COMM_BUFFER_OUT_CAN_RO_ALARM,
-    COMM_BUFFER_OUT_CAN_RO_2_DD,
-    COMM_BUFFER_IN_CAN_TD_ALARM,
-    COMM_BUFFER_IN_CAN_DD_ALARM,
-    COMM_BUFFER_IN_CAN_UI_ALARM,
-    COMM_BUFFER_IN_CAN_DD_2_RO,
-    COMM_BUFFER_IN_CAN_TD_BROADCAST,
-    COMM_BUFFER_IN_CAN_DD_BROADCAST,
-    COMM_BUFFER_IN_CAN_UI_BROADCAST,
-    COMM_BUFFER_OUT_CAN_RO_BROADCAST,
+    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for responding to incoming TD alarm messages
+    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for responding to incoming DD alarm messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing RO alarm messages so no response buffer
+    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for responding to incoming UI alarm messages
+    COMM_BUFFER_OUT_CAN_RO_2_DD,                            ///< Buffer for responding to incoming DD to RO messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing RO to DD messages so no response buffer
+    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for responding to incoming TD broadcast messages
+    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for responding to incoming DD broadcast messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing RO broadcast messages so no response buffer
+    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for responding to incoming UI broadcast messages
     COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for responding to incoming PC to RO messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing RO to PC messages so no response buffer
 };
 
 typedef BOOL (*MsgFuncPtr)( MESSAGE_T* );