FIXING COMMON HEATER CHALLENGES