Updated for tutorial 31