Bunch of changes, including AUTH