C2 karimngr c1s17

#191 @AmrARaouf  @Omar-Hossam  @Mirna-Yacout  @m0hamed