Go back to the old way, with some mods