updated..removed WP7