Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rba7e088fc3308f844ea30376a78e1da6d32621c1 -raa3ebd0c067b4291fcd302735d289cbcde9a0f96
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ba7e088fc3308f844ea30376a78e1da6d32621c1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision aa3ebd0c067b4291fcd302735d289cbcde9a0f96)
@@ -61,8 +61,8 @@
 #define D45_HEAT_P_COEFFICIENT                                     0.03F //0.01F                                                   ///< P Term for trimmer heater control.
 #define D45_HEAT_I_COEFFICIENT                                     0.0005F                                                         ///< I Term for trimmer heater control.
 #define D45_HEAT_TX_INIT_FEED_FORWARD                              0.0F                                                            ///< Initial Feed forward term for heater control
-#define D45_HEAT_HIGHER_QD_P_COEFFICIENT                           0.05F                                                           ///< P Term for trimmer heater control for higher dialysate flow rate.
-#define D45_HEAT_HIGHER_QD_I_COEFFICIENT                           0.015F                                                          ///< I Term for trimmer heater control for higher dialysate flow rate.
+#define D45_HEAT_HIGHER_QD_P_COEFFICIENT                           0.2F                                                            ///< P Term for trimmer heater control for higher dialysate flow rate.
+#define D45_HEAT_HIGHER_QD_I_COEFFICIENT                           0.05F                                                           ///< I Term for trimmer heater control for higher dialysate flow rate.
 #define D45_HEAT_HIGH_DIAL_FLOW_RATE                               200.0F                                                          ///< Decide Trimmer heater - high gain PI control based on the dialysate flow rate
 
 #define HEATERS_DATA_PUBLISH_INTERVAL                              ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                      ///< Heaters data publish interval.
@@ -98,8 +98,8 @@
 #define RINSE_PUMP_EST_FLOWRATE                                    110                                                             ///< Estimated rinse pump flow rate
 #define DATA_PUBLISH_COUNTER_START_COUNT                           70                                                              ///< Data publish counter start count.
 
-#define D5_HEAT_OUT_TX_P_COEFFICIENT                               2.00F //0.5F                                                    ///< P Term for AC primary heater outer loop control during treatment mode.
-#define D5_HEAT_OUT_TX_I_COEFFICIENT                               0.04F //0.08F //0.4F                                            ///< I Term for AC primary heater outer loop control during treatment mode.
+#define D5_HEAT_OUT_TX_P_COEFFICIENT                               0.75F //2.00F //0.5F                                            ///< P Term for AC primary heater outer loop control during treatment mode.
+#define D5_HEAT_OUT_TX_I_COEFFICIENT                               0.1F //0.04F //0.08F //0.4F                                     ///< I Term for AC primary heater outer loop control during treatment mode.
 #define D5_HEAT_OUT_MIN_DELTA_TEMP                                 0.0F                                                            ///< Minimum Delta temperature that can be adjusted for D5 control
 #define D5_HEAT_OUT_MAX_DELTA_TEMP                                 50.0                                                            ///< Maximum Delta temperature that can be adjusted for D5 control
 #define D5_HEAT_OUT_DEADBAND_CONTROL                               0.1F                                                            ///< Heater outer loop dead band range for control.