first round of changes.