Attempt to Reintroduce Better Pagination