Lilach's changes: part3