Final additions for Tutorial Part 2