finish integrating new optional token obfuscation pass