Updated for Tutorial 18