Added Randy's suggested changes.