T5 hazem 5.7

#172 
@eldesouky @jihan2032 @omartarek @attwa @andrewkhouzam