Updated for Tutorial 12