Added exercise 2, 3