Updated for tutorial #9