further work on paginator code