Replace 40gal. with Bradford white 40gal. , 6 year tank 1 year labor warranty water heater, installed new 3/4 ball valve shut off, new expansion tank, new 1/2 gas shut off, new gas line and settlement trap, pumped expansion tank 60 psi., Installed new hole house shut and prv 3/4 tested and no leaked.