We replaced faulty expansion tank and rebuilt electric heater with both top and bottom thermostats and elements