with some changes in pagination