Returned and installed a new 40 gas short water heater. Left the existing ball valve, installed new drip pan, and thermal expansion tank. Replaced section of venting. Tested all work to ensure proper function and no leaks.