Some suggested changes.