Update for working on OSX