Updated for tutorial 40