address @dlundquist comments