Added Nir's note