Will try to change to new auth