For this job I replaced a leaking water heater with a new one. Installed a water heater pan, new thermal expansion tank, gas supply valve be line. Tested with no leaks.
