incorporate Shadi's comments
incorporate Shadi's comments