Updates by Lontra