changes after Lilach comments