Additional changes from Shaun

Shaun was unable to make this commit from his PC, so he emailed me the
updated file for me to commit.