Rewrite of paging code in progress
Rewrite of paging code in progress