Round 2 of updates.