Better update algorithm; use 2FA