Greg's revisions.