Adding infinite scroll functionality together with our recent changes