fix question 2 and add question 4