C2 karimngr c1s16

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