correctly using the mediator
now just fix the paginator calc