Revert "Revert "do some change from omar local pc""

This reverts commit f4b8dc0911a057209ad9b782f0ce58642b8a14f4.