changes work in dev, need to deal with obfuscation