Removed dependency on infinite scroll