Updated from osx machine