question 18 update
added questions
merge