Chapter 2 exercises update -Peter