Updated to wp8