Yippee ki yay Mr. Falcon

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