Confirmation style changes.
Merge conflicts