FIXING STANDARD HEATER CHALLENGES