Updated for Tutorial 6