even more robust pagination and version upgrade