Edits suggested by Andrew