Incorporate Peter's Revisions