Changes for Tutorial 7