lots of new stuff to make save work