Lilach's changes: part2