Fixed flue. Strapped Expansion tank. Also replaced gas shut off to ball valve. Added independent drip leg for water heater.