More changes in WP5.