T2_halawa_2.4

@tonyfoti @helali1993 @FatmaEmran @sedramina