more work on pagination