C2 omar kassem #94 review ideas

#93 @mnzaki , @mohammad-abdulkhaliq , @muhammedabuali  please merge my code