Story 4.8

@rami-khalil @mohamedsaeed93 @fadel1493 @Sharaf93 @mimikian