Pigeon scream 2

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