Two-way infinite scrolling added