Final changes for chapter 2
Quick and dirty script for chapter 3