Made the paging system better