Added a opted out/in feature