auth stuff
merge fix
merge fix