Electoral overhaul