Second batch of changes.