FIXING REGULAR HEATER PROBLEMS