Almost done with exercise 2