--- a/brewco/brewco.h	Fri Dec 11 15:52:37 2015 +0100
+++ b/brewco/brewco.h	Sat Dec 12 19:31:35 2015 +0100
@@ -241,20 +241,14 @@
     double		room_temperature;	/* Simulated envionment temp	*/
     double		hlt_temperature;	/* Simulated HLT temperature	*/
     double		hlt_heater_temp;	/* Maximum heater temp		*/
-    int			hlt_heater_time;	/* Time to reach temperature	*/
-    float		hlt_heater_size;	/* Size of the heater		*/
+    int			hlt_heater_volume;	/* Water volume			*/
+    int			hlt_heater_power;	/* Power of the heater		*/
     int			hlt_heater_state;	/* Heater status		*/
     double		mlt_temperature;	/* Simulated MLT temperature	*/
     double		mlt_heater_temp;	/* Maximum heater temp		*/
-    int			mlt_heater_time;	/* Time to reach temperature	*/
-    float		mlt_heater_size;	/* Size of the heater		*/
+    int			mlt_heater_volume;	/* Water volume			*/
+    int			mlt_heater_power;	/* Power of the heater		*/
     int			mlt_heater_state;	/* Heater status		*/
-    /*
-     * Status values, maintained by the simulator but stored
-     * here so they don't get lost over program restarts.
-     */
-    double		s_hlt_temp;		/* Temp HLT			*/
-    double		s_mlt_temp;		/* Temp MLT			*/
 } simulator_var;
 
 #endif