Lilach's changes: part4