Updated for tutorial 32