Thesis - chapter 4 improved