High-level 3.1 changes