Add paginator
remove some stuff