Added infinite scroll - but bug is thre