Updated Windows solution