Further update to WP8