2nd commit handled some pagination