Updated windows phone implementation