More authenticator work