moved and changed lots of things