Finish Exercise 25
Update Exercise 25