Add answer for 3.6.
Add answer for 3.5.