merge osx and pc
try again