First round of changes.