Install an 80 gallon State Select ES6-80-DORT electric water heater with thermal expansion tank. This tank has been regulated by the Department of Energy and will no longer be in production after April 15.
