added 12
fixed
question 2 added