Added ability to opt back in