Remove leaky water heater and install new electric 50 gallon Bradford white water heater , converted cpvc to copper and install new ball valve, new expansion tank and new drip pan. Turnnon water and check operation, all working properly.