1.7 update (still needs the obfuscation bug sorted out though)