Review comments changes: Removed multiple calls to authenticator.