Installed new safety puff switch and serviced expansion tank with drawing and recharging to 12 psi. All set.