Round 2 of changes.