updated for Mac - now completely unified