Some suggested changes