Small changes based on in-class solution.