Lilach's changes: part1