working changes for windows build
windows commit