adding opt-in-out option. closes #2