Upgrade will paginate