Paginate more better

Be more efficient about pagination.