Final changes for tutorial