WP4.0 upgrade