Lilach's changes: part5