Updated Exercise 7 with the bonus question