Update to question 1