Adding exercise 22 and 23