Removed depedency on infinite scroll