Updated for tutorial 17