Final Commit for the WP8