new stuff
more cleanup