Updates by BEH MOUSSAOUI