moved some old stuff out of the file