2001: a space odyssey

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