v2.5 changes