Make more robust.
try to iron out pump mechanics