Update question 7 & 15