Chapter 1 and 2 updates