Found a leaking 40 gallon gas water heater , replaced with a new Rheem 40 gallon gas short water heater with pan and expansion tank included