Updates by erik