modified wallet_helper