Lior's Merge

Lior's code merged to the common code