Add a first version of question 2