Preparation for infinite scroll, updated framework