We will pull out the old water heater and replace it with a new Rheem 50 gallon natural gas water heater and all the code updates. Code updates include hammer resters, an expansion tank, a drip leg for the gas line and a water heater pan. We will need to rework the gas line, water lines and flu piping to get the tank in a safer place to be strapped to the wall to prevent it from falling or doing damage in the case of a earthquake. 6 year warranty on water heater.