FIXING REGULAR HEATER CHALLENGES