UPDATED TPS6e 6.1 Exercise 7