added some changes for WP8