Changed exercise 8 for extra credit\!