final fix up for question 1