better, but opt-out is handled