Added exercises 17-23