More 2.1 changes