Modified exercise 1&2
Exercise 3