Upgrading a 20th-Century Deal for a 21st-Century Worl