T3 magd elshebokshy 2.8

@AmrEmara @samehmetias @mahmoudawadeen @mostafa-adel 
#177