Chapter 5 & ospybook changes