ADDRESSING COMMON WATER HEATER CHALLENGES