Updated for tutorial 4