everybody was kungfu fighting

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