Updates by McDermott