Massive OSX friendly update