Removed and replaced gas water heater with electric 65 g heat pump water heater. Added Mixing valve and installed new expansion tank. Also replaced gas valve. Tested with no leaks.