changed lots of goodies