Merging in code for iteration 5.