Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r83b1a65b576994e1f8e1476629d8f1277cd67720 -r88b7f489c8da945997f1516600a30032393f5088
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 83b1a65b576994e1f8e1476629d8f1277cd67720)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 88b7f489c8da945997f1516600a30032393f5088)
@@ -34,9 +34,9 @@
 
 // ********** private definitions **********
 
-#define NUM_OF_CAN_OUT_BUFFERS          4       // # of CAN buffers for transmit
-#define NUM_OF_CAN_IN_BUFFERS           6       // # of CAN buffers for receiving
-#define NUM_OF_MSG_IN_BUFFERS           7       // # of Msg buffers for receiving
+#define NUM_OF_CAN_OUT_BUFFERS          5       // # of CAN buffers for transmit
+#define NUM_OF_CAN_IN_BUFFERS           3       // # of CAN buffers for receiving
+#define NUM_OF_MSG_IN_BUFFERS           4       // # of Msg buffers for receiving
 
 #define SCI1_RECEIVE_DMA_REQUEST        30
 #define SCI1_TRANSMIT_DMA_REQUEST       31
@@ -45,21 +45,18 @@
 
 const COMM_BUFFER_T CAN_OUT_BUFFERS[NUM_OF_CAN_OUT_BUFFERS] =
 {
-    COMM_BUFFER_OUT_CAN_HD_ALARM,
-    COMM_BUFFER_OUT_CAN_HD_2_DG,
-    COMM_BUFFER_OUT_CAN_HD_2_UI,
-    COMM_BUFFER_OUT_CAN_HD_BROADCAST
+     COMM_BUFFER_OUT_CAN_DG_ALARM,
+     COMM_BUFFER_OUT_CAN_DG_2_HD,
+     COMM_BUFFER_OUT_CAN_DG_BROADCAST,
+     COMM_BUFFER_OUT_CAN_DG_2_PC,
+     COMM_BUFFER_OUT_UART_PC
 };
 
 const COMM_BUFFER_T MSG_IN_BUFFERS[NUM_OF_MSG_IN_BUFFERS] =
 {
-    COMM_BUFFER_IN_CAN_DG_ALARM,
-    COMM_BUFFER_IN_CAN_UI_ALARM,
-    COMM_BUFFER_IN_CAN_DG_2_HD,
-    COMM_BUFFER_IN_CAN_DG_BROADCAST,
-    COMM_BUFFER_IN_CAN_UI_2_HD,
-    COMM_BUFFER_IN_CAN_UI_BROADCAST,
-    COMM_BUFFER_IN_UART_PC
+     COMM_BUFFER_IN_CAN_HD_2_DG,
+     COMM_BUFFER_IN_CAN_PC_2_DG,
+     COMM_BUFFER_IN_UART_PC
 };
 
 static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};// = {1,2,3,4,5,6,7,8};