Updated in response to questions in class