added exercise 2.36 & 2.37