Make the auth method better