Added Functionality for Mac