Restructured windows version