WIP update for mac