Replaced hot water containment system with new 50 gallon natural gas system bringing all aspects up to code to include but not limited to heater pan, gas valve, gas supply, isolation valve, and thermal expansion tank. At main incoming water feed in same area we replaced the main shut off and pressure regulator valve and set incoming pressure to 70 PSI. Tested and all is working properly at this time.