Updated for tutorial 16