T2 tonyfoti 2.11

Issue #158 
@sedramina @FatmaEmran @helali1993 @mohamed-halawa Please review.