add paginator imcompletely
clean up