Updated pumping code