Latest changes for OSX version