Added some Windows code