added exercise 2.5 and exercise 4