Updates by WASSAN