Final 2.8 revisions