Merging Ruzin and Sanoussy's changes into one

Merge