reflects comments on #5