Hopefully final revisions.