Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rb549c9d87eb01cf1afee74e9fc1e41b3731bdca4 -r8059b3b67364c3593091a23266f33186430ffe26
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b549c9d87eb01cf1afee74e9fc1e41b3731bdca4)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8059b3b67364c3593091a23266f33186430ffe26)
@@ -790,8 +790,7 @@
 
         result = TRUE;
         memcpy( &payload, message->payload, sizeof( TARGET_TEMPS_PAYLOAD_T ) );
-        setPrimaryHeaterTargetTemperature( payload.targetPrimaryHeaterTemp );
-        setTrimmerHeaterTargetTemperature( payload.targetTrimmerHeaterTemp );
+        setHeatersTargetTemperature( &payload );
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
@@ -1031,21 +1030,13 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( message->hdr.payloadLen == sizeof( TRIMMER_HEATER_CMD_T ) )
     {
-        BOOL startingHeater;
+        TRIMMER_HEATER_CMD_T heaterCmd;
 
         result = TRUE;
-        memcpy( &startingHeater, message->payload, sizeof( U32 ) );
-
-        if ( TRUE == startingHeater )
-        {
-            startTrimmerHeaterCmd();
-        }
-        else
-        {
-            stopTrimmerHeaterCmd();
-        }
+        memcpy( &heaterCmd, message->payload, sizeof( TRIMMER_HEATER_CMD_T ) );
+        handleTrimmerHeaterCmd( &heaterCmd );
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );