Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r9d083454c3e951c3b598ceb9dd60cd7e62ad4999 -r2991b6731ff88740f29ea2f19411115d4f8a4aa4
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9d083454c3e951c3b598ceb9dd60cd7e62ad4999)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2991b6731ff88740f29ea2f19411115d4f8a4aa4)
@@ -2309,17 +2309,36 @@
  *************************************************************************/
 void handleLoadCellReadingsFromDG( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof(LOAD_CELL_READINGS_PAYLOAD_T) )
+    if ( message->hdr.payloadLen == sizeof( LOAD_CELL_DATA_T ) )
     {
-        LOAD_CELL_READINGS_PAYLOAD_T payload;
+        LOAD_CELL_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof(LOAD_CELL_READINGS_PAYLOAD_T) );
-        setNewLoadCellReadings( payload.res1PrimaryLoadCell, payload.res1BackupLoadCell, payload.res2PrimaryLoadCell, payload.res2BackupLoadCell );
+        memcpy( &payload, message->payload, sizeof( LOAD_CELL_DATA_T ) );
+        setNewLoadCellReadings( payload.loadCellA1inGram, payload.loadCellA2inGram, payload.loadCellB1inGram, payload.loadCellB2inGram );
     }
 }
 
 /*********************************************************************//**
  * @brief
+ * The handleDGHeatersData function handles the heaters data reading from DG.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGHeatersData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HEATERS_DATA_T ) )
+    {
+        HEATERS_DATA_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HEATERS_DATA_T ) );
+        setDGHeatersData( &payload );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGTemperatureData function handles a temperature readings
  * broadcast message from the DG.
  * @details Inputs: none
@@ -2334,7 +2353,7 @@
         TEMPERATURE_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
+        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
     }
     // TODO - what to do if invalid payload length?
     // TODO - how to know if DG stops sending these?