Getting rid of signaling, percentages, and LOT would be less complex. Activating non-contentious upgrades using a flag day seems simpler to my lizard brain. But maybe I ate too many paint chips as a kid.