Added manual pump control + optimizations