Modified for Mac installation