added dolorespark's mods