Incorporated Nathan's edits.