need to remove overflow, pumping and inflow