Made changes to complete Part 5 of this tutorial