Implement pagination
A merge fix