Boom bam bap barabap boom PAW

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