exercise 6
exercise 7
exercise8
minor updates