Bunch of changes, sorry