Final 2.1 changes