Address dlundquist comments