Jordan Rae's changes for test exercise 1.