Merging Yarden's updates