Editing Nir's version.