Updated for Tutorial 7