Updated windows port