Refined next 400 lines of chapter 2
Completly refined chapter 2