The black market shouldn't be modernized, but rather eliminated!
I agree, I've been practicing playing with a random selection for a while now.
And if the black market is kept, Valera's system is better because it gives Red a chance to avoid being left with nothing when the black market appears.
