Updated for Mac OS