Updated for tutorial 42