made some changes to question 2