pagination plus small reorg