simplify, removing pump by moving logic into dispatch.