Update on WP8

Update on WP8