Robert's suggested changes