Some of Jordach's mods rewritten