Last commit. Pagination still not working