Similar changes made to the answer for question 2.