Added more pumping of events