Tom's suggested changes