Forgot changes from last commit. Attempt as Linux version