This now matches Nic's master exactly.