Updated for tutorial #6