add all the old stuff