changed lots of stuff