Called out for two leaking water heaters. Found 6gal point of use water heater in guest bathroom on 1st floor leaking and currently turned off. Will need to replaced and also discuss repairs/replacement of vanity cabinet as well. Found 40 gal natural gas water heater in 2nd floor mechanical room leaking in pan that’s piped to floor drain. There are two (x2) 40 gallon natural gas short water heaters and the one on the right is leaking and needs to be replaced. Hot water recirculating pump has failed and also needs to be replaced. Will reconfigure both hot and cold water lines for the water heaters to be isolated separately in the event of future leaks/failures. ***recommend replacement of both 40 gal water heaters due to both units being 10+ yrs old. Will submit estimate for that as well.