Further refinement of pagination. not there yet.