One-per-circuit, at least, would be a good change. Not as many as you’re proposing, but does make sense.