updated for osx