Thesis chapter 2 improved, model improved