initial changes
now works with OS X