Working now with MacOS