4.0 upgrade