Added in proposed changes in comments.