Updated windows phone solution.