This solution includes the installation of a disconnect at water heater. In addition we shall replace the breaker for the water heater and complete bonding at water heater. We have installed a new disconnect for water heater, bonded water and replaced the existing breaker for water heater.