Revert "Original Ahmed's Copy"

This reverts commit 94f2e7be1aef82433658f4bd25d70ca359f7ba83.