changed lots of thing