Update with Rich's new hotness.