Chapter 2 finished and new structure