Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -re59287e5915e01c44af22fc54eafc29cb0f6c2c0
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 94a190522ce398399c7b93c59f788d7666ec0060)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision e59287e5915e01c44af22fc54eafc29cb0f6c2c0)
@@ -34,28 +34,22 @@
 
 // ********** Public definitions **********
 
+/// Name of DG heaters
 typedef enum Heaters
 {
     DG_PRIMARY_HEATER = 0,                  ///< DG primary heater
     DG_TRIMMER_HEATER,                      ///< DG trimmer heater
     NUM_OF_DG_HEATERS,                      ///< Number of the heaters
 } DG_HEATERS_T;
 
-/// Target temperature data structure.
+/// Trimmer heater command data structure
 typedef struct
 {
-    F32 targetPrimaryHeaterTemp;            ///< Primary heater set temperature target
-    F32 targetTrimmerHeaterTemp;            ///< Trimmer heater set temperature target
-} TARGET_TEMPS_PAYLOAD_T;
-
-/// Trimmer heater command data structure.
-typedef struct
-{
     BOOL startHeater;                       ///< Flag indicates start or stop heater
     F32 targetTemp;                         ///< Target temperature for heater
 } TRIMMER_HEATER_CMD_T;
 
-/// Heaters data struct.
+/// Heaters data structure.
 typedef struct
 {
     F32 mainPrimayHeaterDC;                 ///< Main primary heater DC
@@ -66,6 +60,9 @@
     U32 primaryHeaterState;                 ///< Primary heater state
     U32 trimmerHeaterState;                 ///< Trimmer heater state
     F32 primaryEfficiency;                  ///< Primary heater efficiency
+    F32 dialysateTargetLPM;                 ///< TODO remove this variable later
+    F32 interimTargetTemp;                  ///< TODO remove this variable later
+    F32 targetHeaterFlowLPM;                ///< TODO remove this variable later
 } HEATERS_DATA_T;
 
 // ********** Public function prototypes **********
@@ -76,7 +73,7 @@
 
 BOOL startHeater( DG_HEATERS_T heater );
 
-F32 getHeaterTargetTemperature( DG_HEATERS_T heater );
+F32  getHeaterTargetTemperature( DG_HEATERS_T heater );
 
 void stopHeater( DG_HEATERS_T heater );