Paginator revisited