I'd get all new things for the air pump too as it holds the same issues as the heater, etc.

todley