Davie504 - I'm calling the police

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