Round 1 of changes. More to come.