Updated with working osx version