added exercise 2 stuff