Adding Ahmed's Commit