Updated for tutorial 21