Final 3.2 changes