Moufid

Merging Moufid's edits