Attemt to implement pagination