updated up to exercise 7