Fixed for pre-stroll
Implemented infinite scrolling