Attempted Pagination Fix