updated with week2 in-class work