Opt-in instead of opt-out
Update minified version