Made changes to complete Part 8 of the tutorial