Revisions from Andrew