incorporated comments from Lilach and from Arik