Merging Nir's changes