C2 karimngr c1s18

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