Updated for tutorial 7