pagination is working better now