Initial batch of changes.