Add a bunch of old stuff and strton