Updated for tutorial 34