New update

Lots of changes