Updated for tutorial 26