Enhancement #3: pagination working