re#89 second round edits.