Update exercise 6.36; Add exercise 6.37