Changed function name, detect osx, i think, need to test