Can't remember what changed, but i think quite a lot
Some more changes