Updates by Ardurra