Adjusted for windows build