T2 halawa 2.11

@helali1993 @tonyfoti @sedramina @FatmaEmran