v2.1 changes