Omid's changes