Paginator improved again