T4 karimelbawab 4.7

#105 @aaeabdo  @osherifo @MennatallahElKharbotly @Zaatar  please review