re#89 second round edits.
re#89 second round edits.