use WalletID more ubiqitously