new and updated version for latest apiserver (now with pages)