Fixed up Chapter 2 ex 4 & 5