-changes to make it work on WP8 (again)