Update for Mac and Linux