Final version for Mac OS