changed lots of things