lots of stuff changed