Final after Wu's suggested edits