Merging shaai's updates