C2 mahmoud gamal #5 verification

@Mennatarek @Almgohar @Eslamunto Please review guys :D