Added Carl's suggested changes