updated to reflect what we did in class last week