Started to handroll pagination
Removed handrolled pagination