changes after Eran's comments