C2 mahmoud gamal #5 verification

Issue #132  @Eslamunto  @Mennatarek  @Almgohar  Please review , sorry eslam :D