updated for Part 2 of tutorial