2+2 is 4 minus 1

Upgrade for private generation and plan-specific commercial usage rights.