OSX Integration continued