Fine-tuned logic for pumping