2.5 upgrade