edits based on Shannon's comments about PR #220