merged modifications done by Ahmad with Hirosh's.