here's my suggested changes.