Added proper multi paging