Updates by remi de lammerville