Revert "Try this omar"

This reverts commit c59a2c21f893d5acb6e708e468dc3e5e1e7c7a24.
new changes
Merge remote-tracking branch 'origin/master'