Exercise 8 -the real one update