Made changes to complete Part 6 and 7 of the tutorial