9.3.3 - finished pagination refactoring