Removed 40 gallon tall water heater. Converted water lines from cpvc to copper. And installed new 40 gallon tall Rheem water heater. Installed new ball valve for positive shut off and rewired to switch. Installed new 2 gallon expansion tank to protect heater and fixtures in home from thermal expansion. Turned water back onto home and tested. Unit was set at 125 and was starting to heat when done. No leaks at this time.