Added exercises 3.16 and 3.17