osx hacks added