[WIP][issue #375] implementation done

@Omar-Hossam 
@Fattouh92 
@m0hamed 
@SalmaFG