Reworked 2 of 3 paginate calls