Updates by ARMANDAB