Updated SmokeyTools