fix the question 8
Add all the remaining question