Added Thomas' revisions