Upstairs water heater: removed and replaced thermal expansion tank that was not working properly. We also mounted it properly to a fixed structure. Removed older gas isolation valve and copper gas line. Replaced with an updated shut off valve and corrugated stainless steel supply line. Ignited the water heater and it is now heating properly. Downstairs water heater: 12 year old heater removed and replaced. Added an isolation valve for the water heater, replaced the thermal expansion tank and properly mounted to a fixed structure, installed a pan and leak alarm for the water heater. Moved water heater away from ventilation to wine cellar.