now including pagination