change to multiple auth-methods
merge