updated for OS X 10.7