minor changes to optout5