Thesis - Chapter 4 improved, model in eap improved