Update for Question 35 and 36 pushed