Changing voting structure slightly, simplifying configuration.