Mod is back to it's previous state, but now much cleaner.