still trying to fix pagination