Revisions from initial feedback.