Changes for question 1