UPDATED TPS6e 7.1 Exercise 7