editing per douws comments