T2 halawa 4.19

#311 @sedramina @tonyfoti @helali1993 @FatmaEmran