Updated fetch algorithm...