small changes with pagination